From 246b2e016ab4a226cc0ac015f5cc340418f81ca1 Mon Sep 17 00:00:00 2001 From: Damien George Date: Sun, 13 Dec 2020 16:15:04 +1100 Subject: [PATCH] py/mkrules.mk: Remove stray vpath and unused -Itmp, add $(Q) for $(AR). Signed-off-by: Damien George --- py/mkrules.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/py/mkrules.mk b/py/mkrules.mk index 3bfe64d753..eb8477cbb1 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: