You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/21 01:45:53 UTC
[incubator-nuttx] branch master updated: Make.defs: Fix printed "||
{ ar blablabla FAILED!" after $(Q) removed
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new fd3e2c5 Make.defs: Fix printed "|| { ar blablabla FAILED!" after $(Q) removed
fd3e2c5 is described below
commit fd3e2c59168cbb8f34713c2cceaf01c1786e1a2a
Author: Alan Carvalho de Assis <en...@siam.ind.br>
AuthorDate: Thu Feb 20 19:43:52 2020 -0600
Make.defs: Fix printed "|| { ar blablabla FAILED!" after $(Q) removed
---
boards/z16/z16f/z16f2800100zcog/scripts/Make.defs | 6 +++---
boards/z80/z8/z8encore000zco/configs/ostest/Make.defs | 6 +++---
boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs | 6 +++---
tools/Config.mk | 8 +-------
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
index f95ddba..ced3b91 100644
--- a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
+++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
@@ -194,7 +194,7 @@ define MOVEOBJ
endef
define ARCHIVE
- for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+ $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -227,8 +227,8 @@ define MOVEOBJ
endef
define ARCHIVE
- for __obj in $(2) ; do \
- "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(Q) for __obj in $(2) ; do \
+ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
index 084569b..047227e 100644
--- a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
+++ b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
@@ -223,7 +223,7 @@ define MOVEOBJ
endef
define ARCHIVE
- for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+ $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -257,8 +257,8 @@ define MOVEOBJ
endef
define ARCHIVE
- for __obj in $(2) ; do \
- "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(Q) for __obj in $(2) ; do \
+ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
index 649343d..fae3c0d 100644
--- a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
+++ b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
@@ -229,7 +229,7 @@ define MOVEOBJ
endef
define ARCHIVE
- for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+ $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -257,8 +257,8 @@ define ASSEMBLE
endef
define ARCHIVE
- for __obj in $(2) ; do \
- "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(Q) for __obj in $(2) ; do \
+ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/tools/Config.mk b/tools/Config.mk
index dbdf129..cf8022a 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -213,15 +213,9 @@ endef
#
# CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE
- $(AR) $1 $(2)
+ $(Q) $(AR) $1 $(2)
endef
-else
-define ARCHIVE
- $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
-endef
-endif
# PRELINK - Prelink a list of files
# This is useful when files were compiled with fvisibility=hidden.