summaryrefslogtreecommitdiffstatshomepage
path: root/unix
diff options
context:
space:
mode:
authorAndrew Scheller <github@loowis.durge.org>2014-04-16 01:46:01 +0100
committerAndrew Scheller <github@loowis.durge.org>2014-04-16 01:46:01 +0100
commit571d5a3363f66b80d8983050168bc06d70357341 (patch)
treef2d09f34d1b01ab66678f335daa9e93c808fdaa3 /unix
parent3b108e76996ed2e159895a606d652983022680a6 (diff)
downloadmicropython-571d5a3363f66b80d8983050168bc06d70357341.tar.gz
micropython-571d5a3363f66b80d8983050168bc06d70357341.zip
New config option MICROPY_FORCE_32BIT (defaulted to 0)
Makes it easier for 64-bit unix hosts to build 32-bit unix binaries (for testing)
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile10
-rw-r--r--unix/mpconfigport.mk3
2 files changed, 13 insertions, 0 deletions
diff --git a/unix/Makefile b/unix/Makefile
index ac1baf3d00..07a75f7adb 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -20,6 +20,16 @@ else
LDFLAGS = $(LDFLAGS_MOD) -lm -Wl,-Map=$@.map,--cref
endif
+ifeq ($(MICROPY_FORCE_32BIT),1)
+CFLAGS += -m32
+LDFLAGS += -m32
+ifeq ($(MICROPY_MOD_FFI),1)
+ifeq ($(UNAME_S),Linux)
+CFLAGS_MOD += -I/usr/include/i686-linux-gnu
+endif
+endif
+endif
+
ifeq ($(MICROPY_USE_READLINE),1)
CFLAGS_MOD += -DMICROPY_USE_READLINE=1
LDFLAGS_MOD += -lreadline
diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk
index bfb01a71f1..352d010676 100644
--- a/unix/mpconfigport.mk
+++ b/unix/mpconfigport.mk
@@ -1,5 +1,8 @@
# Enable/disable modules and 3rd-party libs to be included in interpreter
+# Build 32-bit binaries on a 64-bit host
+MICROPY_FORCE_32BIT = 0
+
# Linking with GNU readline causes binary to be licensed under GPL
MICROPY_USE_READLINE = 1