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.
This commit is contained in:
parent
d07afc934e
commit
342f76a529
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user