diff options
| -rw-r--r-- | atmel-samd/Makefile | 2 | ||||
| -rw-r--r-- | esp8266/Makefile | 4 | ||||
| -rw-r--r-- | py/mkenv.mk | 7 | ||||
| -rw-r--r-- | py/mkrules.mk | 26 |
4 files changed, 22 insertions, 17 deletions
diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile index d6e2090f5..7f6021e73 100644 --- a/atmel-samd/Makefile +++ b/atmel-samd/Makefile @@ -257,7 +257,7 @@ SRC_QSTR += $(SRC_C) $(SRC_BINDINGS_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(ST all: $(BUILD)/firmware.bin $(BUILD)/firmware.elf: $(OBJ) - $(ECHO) "LINK $@" + $(STEPECHO) "LINK $@" $(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group $(Q)$(SIZE) $@ | python3 ../tools/build_memory_info.py $(LD_FILE) diff --git a/esp8266/Makefile b/esp8266/Makefile index 26c3bffa5..8b1dfb328 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -236,7 +236,7 @@ $(FWBIN): $(BUILD)/firmware.elf $(BUILD)/firmware.elf: $(OBJ) - $(ECHO) "LINK $@" + $(STEPECHO) "LINK $@" $(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) $(Q)$(SIZE) $@ @@ -281,5 +281,5 @@ $(BUILD)/libaxtls.a: cd ../lib/axtls; cp config/upyconfig config/.config cd ../lib/axtls; make oldconfig -B cd ../lib/axtls; make clean - cd ../lib/axtls; make all CC="$(CC)" LD="$(LD)" AR="$(AR)" CFLAGS_EXTRA="$(CFLAGS_XTENSA) -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=3072" + cd ../lib/axtls; make all CC="$(Q)$(CC)" LD="$(Q)$(LD)" AR="$(Q)$(AR)" CFLAGS_EXTRA="$(CFLAGS_XTENSA) -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=3072" cp ../lib/axtls/_stage/libaxtls.a $@ diff --git a/py/mkenv.mk b/py/mkenv.mk index 14e23e074..4bf7d3313 100644 --- a/py/mkenv.mk +++ b/py/mkenv.mk @@ -24,12 +24,17 @@ BUILD_VERBOSE = 0 endif ifeq ($(BUILD_VERBOSE),0) Q = @ +STEPECHO = @: +else ifeq ($(BUILD_VERBOSE),1) +Q = @ +STEPECHO = @echo else Q = +STEPECHO = @echo endif # Since this is a new feature, advertise it ifeq ($(BUILD_VERBOSE),0) -$(info Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.) +$(info Use make V=1, make V=2 or set BUILD_VERBOSE similarly in your environment to increase build verbosity.) endif # default settings; can be overriden in main Makefile diff --git a/py/mkrules.mk b/py/mkrules.mk index 2cf160f05..2807fc459 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -22,16 +22,16 @@ endif vpath %.S . $(TOP) $(BUILD)/%.o: %.S - $(ECHO) "CC $<" + $(STEPECHO) "CC $<" $(Q)$(CC) $(CFLAGS) -c -o $@ $< vpath %.s . $(TOP) $(BUILD)/%.o: %.s - $(ECHO) "AS $<" + $(STEPECHO) "AS $<" $(Q)$(AS) -o $@ $< define compile_c -$(ECHO) "CC $<" +$(STEPECHO) "CC $<" $(Q)$(CC) $(CFLAGS) -c -MD -o $@ $< @# The following fixes the dependency file. @# See http://make.paulandlesley.org/autodep.html for details. @@ -55,7 +55,7 @@ QSTR_GEN_EXTRA_CFLAGS += -I$(BUILD)/tmp vpath %.c . $(TOP) $(BUILD)/%.pp: %.c - $(ECHO) "PreProcess $<" + $(STEPECHO) "PreProcess $<" $(Q)$(CC) $(CFLAGS) -E -Wp,-C,-dD,-dI -o $@ $< # The following rule uses | to create an order only prerequisite. Order only @@ -70,7 +70,7 @@ $(BUILD)/%.pp: %.c $(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h $(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) | $(HEADER_BUILD)/mpversion.h - $(ECHO) "GEN $@" + $(STEPECHO) "GEN $@" $(Q)if [ "$?" = "" ]; then \ echo "QSTR Looks like -B used, trying to emulate"; \ $(CPP) $(QSTR_GEN_EXTRA_CFLAGS) $(CFLAGS) $^ >$(HEADER_BUILD)/qstr.i.last; \ @@ -79,12 +79,12 @@ $(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) | $(HEADER_BUILD)/mpversion.h fi $(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last - $(ECHO) "GEN $@" + $(STEPECHO) "GEN $@" $(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py split $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED) $(Q)touch $@ $(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split - $(ECHO) "GEN $@" + $(STEPECHO) "GEN $@" $(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED) # $(sort $(var)) removes duplicates @@ -95,14 +95,14 @@ $(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split OBJ_DIRS = $(sort $(dir $(OBJ))) $(OBJ): | $(OBJ_DIRS) $(OBJ_DIRS): - $(MKDIR) -p $@ + $(Q)$(MKDIR) -p $@ $(HEADER_BUILD): - $(MKDIR) -p $@ + $(Q)$(MKDIR) -p $@ ifneq ($(FROZEN_DIR),) $(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(HEADER_BUILD) $(FROZEN_EXTRA_DEPS) - $(ECHO) "Generating $@" + $(STEPECHO) "Generating $@" $(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@ endif @@ -114,13 +114,13 @@ FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:. # to build .mpy files from .py files $(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py - @$(ECHO) "MPY $<" + $(STEPECHO) "MPY $<" $(Q)$(MKDIR) -p $(dir $@) $(Q)$(MPY_CROSS) -o $@ -s $(^:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $^ # to build frozen_mpy.c from all .mpy files $(BUILD)/frozen_mpy.c: $(FROZEN_MPY_MPY_FILES) $(BUILD)/genhdr/qstrdefs.generated.h - @$(ECHO) "Creating $@" + $(STEPECHO) "Creating $@" $(Q)$(PYTHON) $(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h $(FROZEN_MPY_MPY_FILES) > $@ endif @@ -130,7 +130,7 @@ ifneq ($(PROG),) all: $(PROG) $(PROG): $(OBJ) - $(ECHO) "LINK $@" + $(STEPECHO) "LINK $@" # Do not pass COPT here - it's *C* compiler optimizations. For example, # we may want to compile using Thumb, but link with non-Thumb libc. $(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS) |