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/20 14:32:25 UTC
[incubator-nuttx] branch master updated: Makefile: Remove @echo
from ARCHIVE
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 342f76a Makefile: Remove @echo from ARCHIVE
342f76a is described below
commit 342f76a5292d4b5f70cb0184d21225689c3ccec2
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Feb 19 19:41:54 2020 +0800
Makefile: Remove @echo from ARCHIVE
to avoid shell complain that @echo can't find if the variable expand in the compound
command(e.g. ARLOCK) and remove $(Q) before $AR so the result is almost same as before.
---
boards/z16/z16f/z16f2800100zcog/scripts/Make.defs | 6 ++----
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs | 6 ++----
boards/z80/ez80/ez80f910200zco/scripts/Make.defs | 6 ++----
boards/z80/ez80/makerlisp/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 | 6 ++----
7 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
index daae12b..f95ddba 100644
--- a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
+++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
@@ -194,8 +194,7 @@ define MOVEOBJ
endef
define ARCHIVE
- @echo AR: $2
- $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+ for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -228,8 +227,7 @@ define MOVEOBJ
endef
define ARCHIVE
- $(Q) for __obj in $(2) ; do \
- echo "AR: $$__obj"; \
+ for __obj in $(2) ; do \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done
endef
diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
index bfc83b8..b3c1e84 100644
--- a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
@@ -208,8 +208,7 @@ define MOVEOBJ
endef
define ARCHIVE
- @echo AR: $2
- $(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+ for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -243,8 +242,7 @@ define MOVEOBJ
endef
define ARCHIVE
- $(Q) for __obj in $(2) ; do \
- echo "AR: $$__obj"; \
+ for __obj in $(2) ; do \
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done
endef
diff --git a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
index 2743369..678748a 100644
--- a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
@@ -208,8 +208,7 @@ define MOVEOBJ
endef
define ARCHIVE
- @echo AR: $2
- $(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+ for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -243,8 +242,7 @@ define MOVEOBJ
endef
define ARCHIVE
- $(Q) for __obj in $(2) ; do \
- echo "AR: $$__obj"; \
+ for __obj in $(2) ; do \
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done
endef
diff --git a/boards/z80/ez80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs
index a11db1f..bb86693 100644
--- a/boards/z80/ez80/makerlisp/scripts/Make.defs
+++ b/boards/z80/ez80/makerlisp/scripts/Make.defs
@@ -216,8 +216,7 @@ define MOVEOBJ
endef
define ARCHIVE
- @echo AR: $2
- $(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+ for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -251,8 +250,7 @@ define MOVEOBJ
endef
define ARCHIVE
- $(Q) for __obj in $(2) ; do \
- echo "AR: $$__obj"; \
+ for __obj in $(2) ; do \
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done
endef
diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
index 0ba8439..084569b 100644
--- a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
+++ b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
@@ -223,8 +223,7 @@ define MOVEOBJ
endef
define ARCHIVE
- @echo AR: $2
- $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+ for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -258,8 +257,7 @@ define MOVEOBJ
endef
define ARCHIVE
- $(Q) for __obj in $(2) ; do \
- echo "AR: $$__obj"; \
+ for __obj in $(2) ; do \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done
endef
diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
index 5fddfd0..649343d 100644
--- a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
+++ b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
@@ -229,8 +229,7 @@ define MOVEOBJ
endef
define ARCHIVE
- @echo AR: $2
- $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+ for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -258,8 +257,7 @@ define ASSEMBLE
endef
define ARCHIVE
- $(Q) for __obj in $(2) ; do \
- echo "AR: $$__obj"; \
+ for __obj in $(2) ; do \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done
endef
diff --git a/tools/Config.mk b/tools/Config.mk
index 0f62128..dbdf129 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -215,13 +215,11 @@ endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE
- @echo AR: $2
- $(Q) $(AR) $1 $(2)
+ $(AR) $1 $(2)
endef
else
define ARCHIVE
- @echo "AR: $2"
- $(Q) $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
+ $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
endef
endif