diff options
| author | Craig Hesling <hesling@chromium.org> | 2020-04-01 16:32:21 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-04 04:43:25 +0000 |
| commit | df3945c7fed1831444e9fa73bd799cbc3a987c90 (patch) | |
| tree | acf80c6fb6eb704cdb21ea5a6befefd509de5c3d /Makefile.rules | |
| parent | 2c3cc23589fb9cb2884d2c0a8bb776d962b023f8 (diff) | |
| download | chrome-ec-df3945c7fed1831444e9fa73bd799cbc3a987c90.tar.gz | |
make: Force --no-print-directories
Before this fix, some sub-make invocations did not use
the --no-print-directories and some did. So, you would
still see the build output contaminated by make's
"Entering directory .../ec" and "Leaving directory .../ec"
messages. They are pretty much useless, since they all
mention the same ec directory.
This fix
* once and for all, kills all of those messages.
* simplifies the make file by removing the need to specify the flag
* cleans up the build output by removing the specified flag
BRANCH=none
BUG=none
TEST=make buildall -j
# Ensure that no "Entering dir ..." or "Leaving dir ..."
# messages were emitted.
Signed-off-by: Craig Hesling <hesling@chromium.org>
Change-Id: I5cd7ac8fd2fcf1cde3b03485c17f5fd6969ee7aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2132615
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules index a94611d3b1..3e3ae48bc9 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -39,6 +39,7 @@ echo = echo -n; quiet = echo -n; $(cmd_$(1)) silent = 1>/dev/null silent_err = 2>/dev/null +MAKEFLAGS += --no-print-directory else echo = echo $(1); ifeq ($(V),) @@ -46,6 +47,7 @@ Q := @ quiet = @echo ' $(2)' $(patsubst $(out)/%,%,$@) ; $(cmd_$(1)) silent = 1>/dev/null silent_err = 2>/dev/null +MAKEFLAGS += --no-print-directory else Q := quiet = $(cmd_$(1)) @@ -106,7 +108,7 @@ cmd_c_to_host = $(HOSTCC) $(HOST_CFLAGS) -MMD -MF $@.d -MT $@ -o $@ \ cmd_cxx_to_host = $(HOSTCXX) -std=c++0x $(COMMON_WARN) $(HOST_CXXFLAGS)\ -I ./$($(notdir $@)_ROOT) -o $@ $(filter %.cc,$^) $($(notdir $@)_LIBS) cmd_o_to_a = $(AR) rcs $@ $^ -cmd_host_test = $(MAKE) --no-print-directory BOARD=host PROJECT=$* \ +cmd_host_test = $(MAKE) BOARD=host PROJECT=$* \ V=$(V) out=build/host/$* TEST_BUILD=y EMU_BUILD=y CROSS_COMPILE= \ $(if $(TEST_SCRIPT),TEST_SCRIPT=$(TEST_SCRIPT)) $(TEST_FLAG) \ build/host/$*/$*.exe @@ -139,7 +141,7 @@ cmd_emmc_bootblock = $(out)/util/gen_emmc_transfer_data \ cmd_ipi_table = $(out)/util/gen_ipi_table $@ cmd_cp_script = cp "$<" "$@" && chmod +x "$@" -cmd_libcryptoc_make = $(MAKE) --no-print-directory -C $(CRYPTOCLIB) \ +cmd_libcryptoc_make = $(MAKE) -C $(CRYPTOCLIB) \ obj=$(realpath $(out))/cryptoc \ SUPPORT_UNALIGNED=1 cmd_libcryptoc = $(cmd_libcryptoc_make) -q || $(cmd_libcryptoc_make) @@ -237,12 +239,12 @@ endif # CONFIG_EXPERIMENTAL_CONSOLE=y proj-%: | $(FAILED_BOARDS_DIR) @touch $(FAILED_BOARDS_DIR)/$* @echo "======= building $*" - $(MAKE) --no-print-directory BOARD=$* V=$(V) + $(MAKE) BOARD=$* V=$(V) @rm $(FAILED_BOARDS_DIR)/$* tests-%: @echo "======= building $* tests" - $(MAKE) --no-print-directory BOARD=$* V=$(V) tests + $(MAKE) BOARD=$* V=$(V) tests dis-y := $(out)/RW/$(PROJECT).RW.dis dis-$(CONFIG_FW_INCLUDE_RO) += $(out)/RO/$(PROJECT).RO.dis @@ -275,7 +277,7 @@ ifeq "$(CONFIG_COMMON_RUNTIME)" "y" $(test-targets): test-%: @set -e ; \ $(call echo," BUILD $(out)/$*") \ - $(MAKE) --no-print-directory BOARD=$(BOARD) PROJECT=$* \ + $(MAKE) BOARD=$(BOARD) PROJECT=$* \ V=$(V) out=$(out)/$* TEST_BUILD=y; \ cp $(out)/$*/$*.bin $(out)/test-$*.bin endif |