summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2019-09-11 15:47:52 +1000
committerDamien George <damien.p.george@gmail.com>2019-09-12 18:16:16 +1000
commit6e07fde895ba84281f2e3efd82145a4e1b8a4a1d (patch)
tree81c3f0b0cd6ee9bc544a7f8b4471a3fd72d8bc0d /py
parentf66616556db608d8ca89889340283c532d5c4da0 (diff)
py/mkrules.mk: Add QSTR_GLOBAL_REQUIREMENTS variable for qstr auto-gen.
Diffstat (limited to 'py')
-rw-r--r--py/mkrules.mk2
-rw-r--r--py/py.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 7690c5409..b74dd4549 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -70,7 +70,7 @@ $(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h
# - if anything in QSTR_GLOBAL_DEPENDENCIES is newer, then process all source files ($^)
# - else, if list of newer prerequisites ($?) is not empty, then process just these ($?)
# - else, process all source files ($^) [this covers "make -B" which can set $? to empty]
-$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER_BUILD)/mpversion.h
+$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(QSTR_GLOBAL_REQUIREMENTS)
$(ECHO) "GEN $@"
$(Q)$(CPP) $(QSTR_GEN_EXTRA_CFLAGS) $(CFLAGS) $(if $(filter $?,$(QSTR_GLOBAL_DEPENDENCIES)),$^,$(if $?,$?,$^)) >$(HEADER_BUILD)/qstr.i.last
diff --git a/py/py.mk b/py/py.mk
index d60e694ec..a3d9e790f 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -13,8 +13,10 @@ ifneq ($(QSTR_AUTOGEN_DISABLE),1)
QSTR_DEFS_COLLECTED = $(HEADER_BUILD)/qstrdefs.collected.h
endif
-# Any files listed by this variable will cause a full regeneration of qstrs
+# Any files listed by these variables will cause a full regeneration of qstrs
+# DEPENDENCIES: included in qstr processing; REQUIREMENTS: not included
QSTR_GLOBAL_DEPENDENCIES += $(PY_SRC)/mpconfig.h mpconfigport.h
+QSTR_GLOBAL_REQUIREMENTS += $(HEADER_BUILD)/mpversion.h
# some code is performance bottleneck and compiled with other optimization options
CSUPEROPT = -O3