summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2020-12-13 16:15:04 +1100
committerDamien George <damien@micropython.org>2020-12-14 13:57:15 +1100
commit246b2e016ab4a226cc0ac015f5cc340418f81ca1 (patch)
tree3603f31009a9233abc1450724e418893309eadbd /py
parent0091041f5a1bbf0a2d9ab7ad3de7169f8cc07cf1 (diff)
py/mkrules.mk: Remove stray vpath and unused -Itmp, add $(Q) for $(AR).
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py')
-rw-r--r--py/mkrules.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 3bfe64d75..eb8477cbb 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -15,7 +15,7 @@ CFLAGS += -DMICROPY_ROM_TEXT_COMPRESSION=1
endif
# QSTR generation uses the same CFLAGS, with these modifications.
-QSTR_GEN_FLAGS = -DNO_QSTR -I$(BUILD)/tmp
+QSTR_GEN_FLAGS = -DNO_QSTR
# Note: := to force evalulation immediately.
QSTR_GEN_CFLAGS := $(CFLAGS)
QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS)
@@ -76,8 +76,6 @@ vpath %.c . $(TOP) $(USER_C_MODULES)
$(BUILD)/%.o: %.c
$(call compile_c)
-vpath %.c . $(TOP) $(USER_C_MODULES)
-
vpath %.cpp . $(TOP) $(USER_C_MODULES)
$(BUILD)/%.o: %.cpp
$(call compile_cxx)
@@ -215,7 +213,7 @@ LIBMICROPYTHON = libmicropython.a
# tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
# other file to cause needed effect, e.g. relinking with new lib.
lib $(LIBMICROPYTHON): $(OBJ)
- $(AR) rcs $(LIBMICROPYTHON) $^
+ $(Q)$(AR) rcs $(LIBMICROPYTHON) $^
$(LIBMICROPYTHON_EXTRA_CMD)
clean: