Unverified Commit 8eb39a00 authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by GitHub
Browse files

Merge pull request #1645 from antonio-nino-diaz-arm/an/fix-windows

Makefile: Fix verbose builds on Windows
parents eb746c94 b5a0f4bd
...@@ -78,12 +78,12 @@ ifeq (${V},0) ...@@ -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
......
# #
# 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 ...@@ -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 := :
......
# #
# 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 ...@@ -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 := ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment