Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
8eb39a00
Unverified
Commit
8eb39a00
authored
6 years ago
by
Antonio Niño Díaz
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1645 from antonio-nino-diaz-arm/an/fix-windows
Makefile: Fix verbose builds on Windows
parents
eb746c94
b5a0f4bd
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+2
-2
Makefile
make_helpers/unix.mk
+2
-2
make_helpers/unix.mk
make_helpers/windows.mk
+2
-2
make_helpers/windows.mk
with
6 additions
and
6 deletions
+6
-6
Makefile
View file @
8eb39a00
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
make_helpers/unix.mk
View file @
8eb39a00
#
# Copyright (c) 2016-201
7
, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2016-201
8
, 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
:=
:
...
...
This diff is collapsed.
Click to expand it.
make_helpers/windows.mk
View file @
8eb39a00
#
# Copyright (c) 2016-201
7
, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2016-201
8
, 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 :
=
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help