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

py/py.mk: Split list of uPy sources into core and extmod files.

Browse Source 
If a port only needs the core files then it can now use the $(PY_CORE_O)
variable instead of $(PY_O).  $(PY_EXTMOD_O) contains the list of extmod
files (including some files from lib/). $(PY_O) retains its original
definition as the list of all object file (including those for frozen code)
and is a convenience variable for ports that want everything.
This commit is contained in:
Damien George 2018-02-22 11:13:04 +11:00
parent 6e675c1baa
commit 8ca469cae2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
py/py.mk
View File

@ -101,7 +101,7 @@ $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS)
endif endif
# py object files # py object files
PY_O_BASENAME = \ PY_CORE_O_BASENAME = \
mpstate.o \ mpstate.o \
nlr.o \ nlr.o \
nlrx86.o \ nlrx86.o \
@ -214,6 +214,8 @@ PY_O_BASENAME = \
repl.o \ repl.o \
smallint.o \ smallint.o \
frozenmod.o \ frozenmod.o \
PY_EXTMOD_O_BASENAME = \
../extmod/moductypes.o \ ../extmod/moductypes.o \
../extmod/modujson.o \ ../extmod/modujson.o \
../extmod/modure.o \ ../extmod/modure.o \
@ -248,7 +250,11 @@ PY_O_BASENAME = \
../lib/utils/printf.o \ ../lib/utils/printf.o \
# prepend the build destination prefix to the py object files # prepend the build destination prefix to the py object files
PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) PY_CORE_O = $(addprefix $(PY_BUILD)/, $(PY_CORE_O_BASENAME))
PY_EXTMOD_O = $(addprefix $(PY_BUILD)/, $(PY_EXTMOD_O_BASENAME))
# this is a convenience variable for ports that want core, extmod and frozen code
PY_O = $(PY_CORE_O) $(PY_EXTMOD_O)
# object file for frozen files # object file for frozen files
ifneq ($(FROZEN_DIR),) ifneq ($(FROZEN_DIR),)
@ -262,7 +268,7 @@ endif
# Sources that may contain qstrings # Sources that may contain qstrings
SRC_QSTR_IGNORE = nlr% emitnx86% emitnx64% emitnthumb% emitnarm% emitnxtensa% SRC_QSTR_IGNORE = nlr% emitnx86% emitnx64% emitnthumb% emitnarm% emitnxtensa%
SRC_QSTR = $(SRC_MOD) $(addprefix py/,$(filter-out $(SRC_QSTR_IGNORE),$(PY_O_BASENAME:.o=.c)) emitnative.c) SRC_QSTR = $(SRC_MOD) $(addprefix py/,$(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c)) emitnative.c $(PY_EXTMOD_O_BASENAME:.o=.c))
# Anything that depends on FORCE will be considered out-of-date # Anything that depends on FORCE will be considered out-of-date
FORCE: FORCE: