diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-19 15:44:30 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-19 15:54:27 +0100 |
| commit | b5a0f4bd1910b49b3d11b9bd712f9dc05f894d91 (patch) | |
| tree | efbe69f037a970609edce364da24a07837e9bf09 | |
| parent | 0595abceba85bee8d6c27e6e122722f816610df7 (diff) | |
Makefile: Fix verbose builds on Windows
Commit <ee1ba6d4ddf1> ("Makefile: Support totally quiet output with -s")
broke verbose (V=1) builds on Windows. This patch fixes it by adding
helpers to silence echo prints in a OS-dependent way.
Change-Id: I24669150457516e9fb34fa32fa103398efe8082d
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | make_helpers/unix.mk | 4 | ||||
| -rw-r--r-- | make_helpers/windows.mk | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -78,12 +78,12 @@ ifeq (${V},0) CHECKCODE_ARGS += --no-summary --terse else Q:= - ECHO:=@\# + ECHO:=$(ECHO_QUIET) endif ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) Q:=@ - ECHO:=@\# + ECHO:=$(ECHO_QUIET) endif export Q ECHO diff --git a/make_helpers/unix.mk b/make_helpers/unix.mk index 17f8a7c2..545ddfde 100644 --- a/make_helpers/unix.mk +++ b/make_helpers/unix.mk @@ -1,9 +1,8 @@ # -# Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -# # Trusted Firmware shell command definitions for a Unix style environment. @@ -11,6 +10,7 @@ ifndef UNIX_MK UNIX_MK := $(lastword $(MAKEFILE_LIST)) ECHO_BLANK_LINE := echo + ECHO_QUIET := @\# DIR_DELIM := / PATH_SEP := : diff --git a/make_helpers/windows.mk b/make_helpers/windows.mk index 69f6a017..5ab8bdc4 100644 --- a/make_helpers/windows.mk +++ b/make_helpers/windows.mk @@ -1,9 +1,8 @@ # -# Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -# # OS specific parts for builds in a Windows_NT environment. The # environment variable OS is set to Windows_NT on all modern Windows platforms @@ -14,6 +13,7 @@ ifndef WINDOWS_MK WINDOWS_MK := $(lastword $(MAKEFILE_LIST)) ECHO_BLANK_LINE := @cmd /c echo. + ECHO_QUIET := @rem DIR_DELIM := $(strip \) BIN_EXT := .exe PATH_SEP := ; |