Please apply attached patch to remove annoying "FAILED!" message.
BR,
Alan
From 4827ab2494de4e8743ffcfd030c423ee9c40218c Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <engenhari...@siam.ind.br>
Date: Thu, 20 Feb 2020 21:15:50 -0300
Subject: [PATCH] Fix printed "|| { ar blablabla FAILED!" after $(Q) removed
---
boards/z16/z16f/z16f2800100zcog/scripts/Make.defs | 2 +-
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs | 2 +-
boards/z80/ez80/ez80f910200zco/scripts/Make.defs | 2 +-
boards/z80/ez80/makerlisp/scripts/Make.defs | 2 +-
boards/z80/z8/z8encore000zco/configs/ostest/Make.defs | 2 +-
boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs | 2 +-
tools/Config.mk | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
index f95ddbaf6d..31c00195d7 100644
--- a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
+++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
@@ -228,7 +228,7 @@ endef
define ARCHIVE
for __obj in $(2) ; do \
- "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
index b3c1e845bd..ae34dbee6f 100644
--- a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
@@ -243,7 +243,7 @@ endef
define ARCHIVE
for __obj in $(2) ; do \
- $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(AR) $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
index 678748ad91..91f8287f62 100644
--- a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
@@ -243,7 +243,7 @@ endef
define ARCHIVE
for __obj in $(2) ; do \
- $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(AR) $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/ez80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs
index bb86693056..0d292579bf 100644
--- a/boards/z80/ez80/makerlisp/scripts/Make.defs
+++ b/boards/z80/ez80/makerlisp/scripts/Make.defs
@@ -251,7 +251,7 @@ endef
define ARCHIVE
for __obj in $(2) ; do \
- $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(AR) $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
index 084569b02f..031fe09f23 100644
--- a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
+++ b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs
@@ -258,7 +258,7 @@ endef
define ARCHIVE
for __obj in $(2) ; do \
- "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
index 649343d78a..c99bca531c 100644
--- a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
+++ b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs
@@ -258,7 +258,7 @@ endef
define ARCHIVE
for __obj in $(2) ; do \
- "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ "$(AR)" $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/tools/Config.mk b/tools/Config.mk
index dbdf129b4f..e02d1fbb76 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -219,7 +219,7 @@ define ARCHIVE
endef
else
define ARCHIVE
- $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; }
+ $(AR) $1 $(2)
endef
endif
--
2.20.1
