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

py/mkenv.mk: Move usage of 32-bit flags to py.mk.

Browse Source 
This allows ports/variants to configure MICROPY_FORCE_32BIT after including
mkenv.mk, but before py.mk.
This commit is contained in:
Jim Mussared 2019-10-23 11:56:37 +11:00 committed by Damien George
parent bfbd94401d
commit 7d2ccd027f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/mkenv.mk
View File

@ -55,11 +55,6 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
SIZE = $(CROSS_COMPILE)size SIZE = $(CROSS_COMPILE)size
STRIP = $(CROSS_COMPILE)strip STRIP = $(CROSS_COMPILE)strip
AR = $(CROSS_COMPILE)ar AR = $(CROSS_COMPILE)ar
ifeq ($(MICROPY_FORCE_32BIT),1)
CC += -m32
CXX += -m32
LD += -m32
endif
MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py
MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py

7
py/py.mk
View File

@ -21,6 +21,13 @@ QSTR_GLOBAL_REQUIREMENTS += $(HEADER_BUILD)/mpversion.h
# some code is performance bottleneck and compiled with other optimization options # some code is performance bottleneck and compiled with other optimization options
CSUPEROPT = -O3 CSUPEROPT = -O3
# Enable building 32-bit code on 64-bit host.
ifeq ($(MICROPY_FORCE_32BIT),1)
CC += -m32
CXX += -m32
LD += -m32
endif
# External modules written in C. # External modules written in C.
ifneq ($(USER_C_MODULES),) ifneq ($(USER_C_MODULES),)
# pre-define USERMOD variables as expanded so that variables are immediate # pre-define USERMOD variables as expanded so that variables are immediate