Skip to content

Commit 6ec6f51

Browse files
committed
unix: Build libffi in a directory which is gitgnored.
To avoid "-dirty" version previous and spurious "modified" output from git status, etc.
1 parent 4542643 commit 6ec6f51

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

unix/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ endif
8181
ifeq ($(MICROPY_PY_FFI),1)
8282

8383
ifeq ($(MICROPY_STANDALONE),1)
84-
LIBFFI_CFLAGS_MOD := -I$(shell ls -1d ../lib/libffi/out/lib/libffi-*/include)
84+
LIBFFI_CFLAGS_MOD := -I$(shell ls -1d ../lib/libffi/build_dir/out/lib/libffi-*/include)
8585
ifeq ($(MICROPY_FORCE_32BIT),1)
86-
LIBFFI_LDFLAGS_MOD = ../lib/libffi/out/lib32/libffi.a
86+
LIBFFI_LDFLAGS_MOD = ../lib/libffi/build_dir/out/lib32/libffi.a
8787
else
88-
LIBFFI_LDFLAGS_MOD = ../lib/libffi/out/lib/libffi.a
88+
LIBFFI_LDFLAGS_MOD = ../lib/libffi/build_dir/out/lib/libffi.a
8989
endif
9090
else
9191
LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
@@ -205,7 +205,8 @@ deplibs: libffi axtls
205205
libffi:
206206
cd ../lib/libffi; git clean -d -x -f
207207
cd ../lib/libffi; ./autogen.sh
208-
cd ../lib/libffi; ./configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; make install
208+
mkdir -p ../lib/libffi/build_dir; cd ../lib/libffi/build_dir; \
209+
../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; make install
209210

210211
axtls:
211212
cd ../lib/axtls; cp config/upyconfig config/.config

0 commit comments

Comments
 (0)