summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-21 02:00:03 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-21 02:00:03 +0100
commitb33d72aa89be902e49bdd804e1494dbb901d4c07 (patch)
treed77f364555da404fe5f3083e05b6db0e138a6e71
parent34f01c2ca1dd1a352630ffb7b43fd1c832cf7886 (diff)
parentc7d2b10b85fdc26f9342eb71192c49de28ec11cc (diff)
downloadmicropython-b33d72aa89be902e49bdd804e1494dbb901d4c07.tar.gz
micropython-b33d72aa89be902e49bdd804e1494dbb901d4c07.zip
Merge branch 'master' of github.com:micropython/micropython
-rw-r--r--unix/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/unix/Makefile b/unix/Makefile
index ec02ad5004..304f09062d 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -45,8 +45,10 @@ CFLAGS_MOD += -DMICROPY_MOD_TIME=1
SRC_MOD += modtime.c
endif
ifeq ($(MICROPY_MOD_FFI),1)
-CFLAGS_MOD += `pkg-config --cflags libffi` -DMICROPY_MOD_FFI=1
-LDFLAGS_MOD += -ldl -lffi
+LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
+LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
+CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_MOD_FFI=1
+LDFLAGS_MOD += -ldl $(LIBFFI_LDFLAGS_MOD)
SRC_MOD += modffi.c
endif