8000 py/mkrules.mk: Remove stray vpath and unused -Itmp, add $(Q) for $(AR). · mbtronics/micropython@246b2e0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 246b2e0

Browse files
committed
py/mkrules.mk: Remove stray vpath and unused -Itmp, add $(Q) for $(AR).
Signed-off-by: Damien George <damien@micropython.org>
1 parent 0091041 commit 246b2e0

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

py/mkrules.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CFLAGS += -DMICROPY_ROM_TEXT_COMPRESSION=1
1515
endif
1616

1717
# QSTR generation uses the same CFLAGS, with these modifications.
18-
QSTR_GEN_FLAGS = -DNO_QSTR -I$(BUILD)/tmp
18+
QSTR_GEN_FLAGS = -DNO_QSTR
1919
# Note: := to force evalulation immediately.
2020
QSTR_GEN_CFLAGS := $(CFLAGS)
2121
QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS)
@@ -76,8 +76,6 @@ vpath %.c . $(TOP) $(USER_C_MODULES)
7676
$(BUILD)/%.o: %.c
7777
$(call compile_c)
7878

79-
vpath %.c . $(TOP) $(USER_C_MODULES)
80-
8179
vpath %.cpp . $(TOP) $(USER_C_MODULES)
8280
$(BUILD)/%.o: %.cpp
8381
$(call compile_cxx)
@@ -215,7 +213,7 @@ LIBMICROPYTHON = libmicropython.a
215213
# tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
216214
# other file to cause needed effect, e.g. relinking with new lib.
217215
lib $(LIBMICROPYTHON): $(OBJ)
218-
$(AR) rcs $(LIBMICROPYTHON) $^
216+
$(Q)$(AR) rcs $(LIBMICROPYTHON) $^
219217
$(LIBMICROPYTHON_EXTRA_CMD)
220218

221219
clean:

0 commit comments

Comments
 (0)
0