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

Make.defs: Fix printed "|| { ar blablabla FAILED!" after $(Q) removed

Browse Source
This commit is contained in:
Alan Carvalho de Assis 2020-02-20 19:43:52 -06:00 committed by Gregory Nutt
parent eb1adcafe3
commit fd3e2c5916
4 changed files with 10 additions and 16 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,7 +194,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
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
@ -227,8 +227,8 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
for __obj in $(2) ; do \ $(Q) for __obj in $(2) ; do \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done done
endef endef

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

@ -223,7 +223,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
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
@ -257,8 +257,8 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
for __obj in $(2) ; do \ $(Q) for __obj in $(2) ; do \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done done
endef endef

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

@ -229,7 +229,7 @@ define MOVEOBJ
endef endef
define ARCHIVE define ARCHIVE
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
@ -257,8 +257,8 @@ define ASSEMBLE
endef endef
define ARCHIVE define ARCHIVE
for __obj in $(2) ; do \ $(Q) for __obj in $(2) ; do \
"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done done
endef endef

8
tools/Config.mk
View File

@ -213,15 +213,9 @@ endef
# #
# CONFIG_WINDOWS_NATIVE - Defined for a Windows native build # CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
$(AR) $1 $(2) $(Q) $(AR) $1 $(2)
endef endef
else
define ARCHIVE
$(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
endef
endif
# PRELINK - Prelink a list of files # PRELINK - Prelink a list of files
# This is useful when files were compiled with fvisibility=hidden. # This is useful when files were compiled with fvisibility=hidden.