Skip to content

Commit

Permalink
py/mkrules.mk: Remove stray vpath and unused -Itmp, add $(Q) for $(AR).
Browse files Browse the repository at this point in the history
Signed-off-by: Damien George <[email protected]>
  • Loading branch information
dpgeorge authored and pfalcon committed Dec 22, 2020
1 parent da4f738 commit e141252
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions py/mkrules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -205,7 +203,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:
Expand Down

0 comments on commit e141252

Please sign in to comment.