sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: Remove @echo from ARCHIVE

Browse Source 
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.
This commit is contained in:
Xiang Xiao 2020-02-19 19:41:54 +08:00 committed by Gregory Nutt
parent d07afc934e
commit 342f76a529
7 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
View File

@ -194,8 +194,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
@echo AR: $2 for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
define CLEAN define CLEAN
@ -228,8 +227,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2) ; do \ for __obj in $(2) ; do \
echo "AR: $$__obj"; \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef

6
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
View File

@ -208,8 +208,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
@echo AR: $2 for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
$(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef endef
define CLEAN define CLEAN
@ -243,8 +242,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2) ; do \ for __obj in $(2) ; do \
echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef

6
boards/z80/ez80/ez80f910200zco/scripts/Make.defs
View File

@ -208,8 +208,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
@echo AR: $2 for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
$(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef endef
define CLEAN define CLEAN
@ -243,8 +242,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2) ; do \ for __obj in $(2) ; do \
echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef

6
boards/z80/ez80/makerlisp/scripts/Make.defs
View File

@ -216,8 +216,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
@echo AR: $2 for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
$(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef endef
define CLEAN define CLEAN
@ -251,8 +250,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2) ; do \ for __obj in $(2) ; do \
echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef

6
boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
View File

@ -223,8 +223,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
@echo AR: $2 for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
define CLEAN define CLEAN
@ -258,8 +257,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2) ; do \ for __obj in $(2) ; do \
echo "AR: $$__obj"; \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef

6
boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
View File

@ -229,8 +229,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
@echo AR: $2 for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
define CLEAN define CLEAN
@ -258,8 +257,7 @@ define ASSEMBLE
endef endef
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2) ; do \ for __obj in $(2) ; do \
echo "AR: $$__obj"; \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef

6
tools/Config.mk
View File

@ -215,13 +215,11 @@ endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
@echo AR: $2 $(AR) $1 $(2)
$(Q) $(AR) $1 $(2)
endef endef
else else
define ARCHIVE define ARCHIVE
@echo "AR: $2" $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
$(Q) $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
endef endef
endif endif