djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/mkrules.mk: Remove stray vpath and unused -Itmp, add $(Q) for $(AR).

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2020-12-13 16:15:04 +11:00
parent 0091041f5a
commit 246b2e016a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/mkrules.mk
View File

@ -15,7 +15,7 @@ CFLAGS += -DMICROPY_ROM_TEXT_COMPRESSION=1
endif endif
# QSTR generation uses the same CFLAGS, with these modifications. # 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. # Note: := to force evalulation immediately.
QSTR_GEN_CFLAGS := $(CFLAGS) QSTR_GEN_CFLAGS := $(CFLAGS)
QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS) QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS)
@ -76,8 +76,6 @@ vpath %.c . $(TOP) $(USER_C_MODULES)
$(BUILD)/%.o: %.c $(BUILD)/%.o: %.c
$(call compile_c) $(call compile_c)
vpath %.c . $(TOP) $(USER_C_MODULES)
vpath %.cpp . $(TOP) $(USER_C_MODULES) vpath %.cpp . $(TOP) $(USER_C_MODULES)
$(BUILD)/%.o: %.cpp $(BUILD)/%.o: %.cpp
$(call compile_cxx) $(call compile_cxx)
@ -215,7 +213,7 @@ LIBMICROPYTHON = libmicropython.a
# tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some # tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
# other file to cause needed effect, e.g. relinking with new lib. # other file to cause needed effect, e.g. relinking with new lib.
lib $(LIBMICROPYTHON): $(OBJ) lib $(LIBMICROPYTHON): $(OBJ)
$(AR) rcs $(LIBMICROPYTHON) $^ $(Q)$(AR) rcs $(LIBMICROPYTHON) $^
$(LIBMICROPYTHON_EXTRA_CMD) $(LIBMICROPYTHON_EXTRA_CMD)
clean: clean: