djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Build libffi in a directory which is gitgnored.

Browse Source 
To avoid "-dirty" version previous and spurious "modified" output from
git status, etc.
This commit is contained in:
Paul Sokolovsky 2015-10-18 00:20:24 +03:00
parent 4542643025
commit 6ec6f51326
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unix/Makefile
View File

@ -81,11 +81,11 @@ endif
ifeq ($(MICROPY_PY_FFI),1) ifeq ($(MICROPY_PY_FFI),1)
ifeq ($(MICROPY_STANDALONE),1) ifeq ($(MICROPY_STANDALONE),1)
LIBFFI_CFLAGS_MOD := -I$(shell ls -1d ../lib/libffi/out/lib/libffi-*/include) LIBFFI_CFLAGS_MOD := -I$(shell ls -1d ../lib/libffi/build_dir/out/lib/libffi-*/include)
ifeq ($(MICROPY_FORCE_32BIT),1) ifeq ($(MICROPY_FORCE_32BIT),1)
LIBFFI_LDFLAGS_MOD = ../lib/libffi/out/lib32/libffi.a LIBFFI_LDFLAGS_MOD = ../lib/libffi/build_dir/out/lib32/libffi.a
else else
LIBFFI_LDFLAGS_MOD = ../lib/libffi/out/lib/libffi.a LIBFFI_LDFLAGS_MOD = ../lib/libffi/build_dir/out/lib/libffi.a
endif endif
else else
LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi) LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
@ -205,7 +205,8 @@ deplibs: libffi axtls
libffi: libffi:
cd ../lib/libffi; git clean -d -x -f cd ../lib/libffi; git clean -d -x -f
cd ../lib/libffi; ./autogen.sh cd ../lib/libffi; ./autogen.sh
cd ../lib/libffi; ./configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; make install mkdir -p ../lib/libffi/build_dir; cd ../lib/libffi/build_dir; \
../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; make install
axtls: axtls:
cd ../lib/axtls; cp config/upyconfig config/.config cd ../lib/axtls; cp config/upyconfig config/.config