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

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.