summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2018-07-29 14:58:30 +0300
committerDamien George <damien.p.george@gmail.com>2018-08-14 17:20:18 +1000
commitab78fe0eb9997622e40d412d5f7d5e9b1a91e47a (patch)
treeb5ef5e6b7266c5dfd01e151eb446f0a19f9d3290
parent8300be6d0f7505f78802bee7e7aece422608d08e (diff)
mpy-cross/Makefile: Also undefine MICROPY_FORCE_32BIT and CROSS_COMPILE.
mpy-cross is a host, not target binary. It should not be build with the target compiler, compiler options and other settings. For example, If someone currently tries to build from pristine checkout the unix port with the following command: make CROSS_COMPILE=arm-linux-gnueabihf- then mpy-cross will be built with arm-linux-gnueabihf-gcc and of course won't run on the host, leading to overall build failure. This situation was worked around for some options in 1d8c3f4cff1, so add MICROPY_FORCE_32BIT and CROSS_COMPILE to that set too.
-rw-r--r--mpy-cross/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 0f39a6393..c42c2c5ab 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -5,6 +5,8 @@ ifneq ($(findstring undefine,$(.FEATURES)),)
override undefine COPT
override undefine CFLAGS_EXTRA
override undefine LDFLAGS_EXTRA
+override undefine MICROPY_FORCE_32BIT
+override undefine CROSS_COMPILE
override undefine FROZEN_DIR
override undefine FROZEN_MPY_DIR
override undefine BUILD