Skip to content

Commit 35071b3

Browse files
tannewttannewt
committed
Make the build quieter by default.
1 parent baf3ff3 commit 35071b3

4 files changed

Lines changed: 22 additions & 17 deletions

File tree

‎atmel-samd/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ SRC_QSTR += $(SRC_C) $(SRC_BINDINGS_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(ST
257257
all: $(BUILD)/firmware.bin
258258

259259
$(BUILD)/firmware.elf: $(OBJ)
260-
$(ECHO) "LINK $@"
260+
$(STEPECHO) "LINK $@"
261261
$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
262262
$(Q)$(SIZE) $@ | python3 ../tools/build_memory_info.py $(LD_FILE)
263263

‎esp8266/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ $(FWBIN): $(BUILD)/firmware.elf
236236

237237

238238
$(BUILD)/firmware.elf: $(OBJ)
239-
$(ECHO) "LINK $@"
239+
$(STEPECHO) "LINK $@"
240240
$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
241241
$(Q)$(SIZE) $@
242242

@@ -281,5 +281,5 @@ $(BUILD)/libaxtls.a:
281281
cd ../lib/axtls; cp config/upyconfig config/.config
282282
cd ../lib/axtls; make oldconfig -B
283283
cd ../lib/axtls; make clean
284-
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"
284+
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"
285285
cp ../lib/axtls/_stage/libaxtls.a $@

‎py/mkenv.mk‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ BUILD_VERBOSE = 0
2424
endif
2525
ifeq ($(BUILD_VERBOSE),0)
2626
Q = @
27+
STEPECHO = @:
28+
else ifeq ($(BUILD_VERBOSE),1)
29+
Q = @
30+
STEPECHO = @echo
2731
else
2832
Q =
33+
STEPECHO = @echo
2934
endif
3035
# Since this is a new feature, advertise it
3136
ifeq ($(BUILD_VERBOSE),0)
32-
$(info Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.)
37+
$(info Use make V=1, make V=2 or set BUILD_VERBOSE similarly in your environment to increase build verbosity.)
3338
endif
3439

3540
# default settings; can be overriden in main Makefile

‎py/mkrules.mk‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ endif
2222

2323
vpath %.S . $(TOP)
2424
$(BUILD)/%.o: %.S
25-
$(ECHO) "CC $<"
25+
$(STEPECHO) "CC $<"
2626
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
2727

2828
vpath %.s . $(TOP)
2929
$(BUILD)/%.o: %.s
30-
$(ECHO) "AS $<"
30+
$(STEPECHO) "AS $<"
3131
$(Q)$(AS) -o $@ $<
3232

3333
define compile_c
34-
$(ECHO) "CC $<"
34+
$(STEPECHO) "CC $<"
3535
$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $<
3636
@# The following fixes the dependency file.
3737
@# See http://make.paulandlesley.org/autodep.html for details.
@@ -55,7 +55,7 @@ QSTR_GEN_EXTRA_CFLAGS += -I$(BUILD)/tmp
5555
vpath %.c . $(TOP)
5656

5757
$(BUILD)/%.pp: %.c
58-
$(ECHO) "PreProcess $<"
58+
$(STEPECHO) "PreProcess $<"
5959
$(Q)$(CC) $(CFLAGS) -E -Wp,-C,-dD,-dI -o $@ $<
6060

6161
# The following rule uses | to create an order only prerequisite. Order only
@@ -70,7 +70,7 @@ $(BUILD)/%.pp: %.c
7070
$(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h
7171

7272
$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) | $(HEADER_BUILD)/mpversion.h
73-
$(ECHO) "GEN $@"
73+
$(STEPECHO) "GEN $@"
7474
$(Q)if [ "$?" = "" ]; then \
7575
echo "QSTR Looks like -B used, trying to emulate"; \
7676
$(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
7979
fi
8080

8181
$(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last
82-
$(ECHO) "GEN $@"
82+
$(STEPECHO) "GEN $@"
8383
$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py split $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED)
8484
$(Q)touch $@
8585

8686
$(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split
87-
$(ECHO) "GEN $@"
87+
$(STEPECHO) "GEN $@"
8888
$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED)
8989

9090
# $(sort $(var)) removes duplicates
@@ -95,14 +95,14 @@ $(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split
9595
OBJ_DIRS = $(sort $(dir $(OBJ)))
9696
$(OBJ): | $(OBJ_DIRS)
9797
$(OBJ_DIRS):
98-
$(MKDIR) -p $@
98+
$(Q)$(MKDIR) -p $@
9999

100100
$(HEADER_BUILD):
101-
$(MKDIR) -p $@
101+
$(Q)$(MKDIR) -p $@
102102

103103
ifneq ($(FROZEN_DIR),)
104104
$(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(HEADER_BUILD) $(FROZEN_EXTRA_DEPS)
105-
$(ECHO) "Generating $@"
105+
$(STEPECHO) "Generating $@"
106106
$(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@
107107
endif
108108

@@ -114,13 +114,13 @@ FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.
114114

115115
# to build .mpy files from .py files
116116
$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py
117-
@$(ECHO) "MPY $<"
117+
$(STEPECHO) "MPY $<"
118118
$(Q)$(MKDIR) -p $(dir $@)
119119
$(Q)$(MPY_CROSS) -o $@ -s $(^:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $^
120120

121121
# to build frozen_mpy.c from all .mpy files
122122
$(BUILD)/frozen_mpy.c: $(FROZEN_MPY_MPY_FILES) $(BUILD)/genhdr/qstrdefs.generated.h
123-
@$(ECHO) "Creating $@"
123+
$(STEPECHO) "Creating $@"
124124
$(Q)$(PYTHON) $(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h $(FROZEN_MPY_MPY_FILES) > $@
125125
endif
126126

@@ -130,7 +130,7 @@ ifneq ($(PROG),)
130130
all: $(PROG)
131131

132132
$(PROG): $(OBJ)
133-
$(ECHO) "LINK $@"
133+
$(STEPECHO) "LINK $@"
134134
# Do not pass COPT here - it's *C* compiler optimizations. For example,
135135
# we may want to compile using Thumb, but link with non-Thumb libc.
136136
$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)

0 commit comments

Comments
 (0)