Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-28 08:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile: Fix verbose builds on Windows

Browse source 
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>
This commit is contained in:
Antonio Nino Diaz 2018-10-19 15:44:30 +01:00
parent 0595abceba
commit b5a0f4bd19
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -78,12 +78,12 @@ ifeq (${V},0)
CHECKCODE_ARGS += --no-summary --terse CHECKCODE_ARGS += --no-summary --terse
else else
Q:= Q:=
ECHO:=@\# ECHO:=$(ECHO_QUIET)
endif endif
ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
Q:=@ Q:=@
ECHO:=@\# ECHO:=$(ECHO_QUIET)
endif endif
export Q ECHO export Q ECHO

4
make_helpers/unix.mk
View file

@ -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 # SPDX-License-Identifier: BSD-3-Clause
# #
#
# Trusted Firmware shell command definitions for a Unix style environment. # Trusted Firmware shell command definitions for a Unix style environment.
@ -11,6 +10,7 @@ ifndef UNIX_MK
UNIX_MK := $(lastword $(MAKEFILE_LIST)) UNIX_MK := $(lastword $(MAKEFILE_LIST))
ECHO_BLANK_LINE := echo ECHO_BLANK_LINE := echo
ECHO_QUIET := @\#
DIR_DELIM := / DIR_DELIM := /
PATH_SEP := : PATH_SEP := :

4
make_helpers/windows.mk
View file

@ -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 # SPDX-License-Identifier: BSD-3-Clause
# #
#
# OS specific parts for builds in a Windows_NT environment. The # OS specific parts for builds in a Windows_NT environment. The
# environment variable OS is set to Windows_NT on all modern Windows platforms # 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)) WINDOWS_MK := $(lastword $(MAKEFILE_LIST))
ECHO_BLANK_LINE := @cmd /c echo. ECHO_BLANK_LINE := @cmd /c echo.
ECHO_QUIET := @rem
DIR_DELIM := $(strip \) DIR_DELIM := $(strip \)
BIN_EXT := .exe BIN_EXT := .exe
PATH_SEP := ; PATH_SEP := ;