summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2017-10-12 20:10:31 -0400
committerDan Halbert <halbert@halwitz.org>2017-10-12 20:10:31 -0400
commitfabaa2ec3045c4709de05c238a6525d0fe2e3cb2 (patch)
tree7df563824134ca60ba95eb6f376220eb7b49f7ae /py
parentb7591cfd19d308091dc67ae698c112cdb52a044f (diff)
parent922006dd59323e6019e8fbfe1938e0c30121999c (diff)
merge 2.x changes into master; touch up Makefile CFLAGS logic
Diffstat (limited to 'py')
-rw-r--r--py/mkrules.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 9ed5483b2..656ffd03c 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -46,6 +46,12 @@ vpath %.c . $(TOP)
$(BUILD)/%.o: %.c
$(call compile_c)
+# frozen.c and frozen_mpy.c are created in $(BUILD), so use our rule
+# for those as well.
+vpath %.c . $(BUILD)
+$(BUILD)/%.o: %.c
+ $(call compile_c)
+
# List all native flags since the current build system doesn't have
# the MicroPython configuration available. However, these flags are
# needed to extract all qstrings