[gentoo-commits] repo/gentoo:master commit in: eclass/tests/

[Michał Górny]

commit:     bcce21e5e6b31aca6b2f8edb15328edc8f078d52
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 09:41:05 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 20:52:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcce21e5

eclass/tests/toolchain-funcs.sh: Handle missing ld.gold gracefully

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/tests/toolchain-funcs.sh | 64 ++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh
index d8a357fb24fe..08cfd74611aa 100755
--- a/eclass/tests/toolchain-funcs.sh
+++ b/eclass/tests/toolchain-funcs.sh
@@ -60,20 +60,22 @@ tbegin "tc-ld-is-gold (ld=bfd cc=bfd)"
 LD=ld.bfd LDFLAGS=-fuse-ld=bfd tc-ld-is-gold && ret=1 || ret=0
 tend ${ret}
 
-tbegin "tc-ld-is-gold (ld=gold cc=default)"
-LD=ld.gold tc-ld-is-gold
-ret=$?
-tend ${ret}
-
-tbegin "tc-ld-is-gold (ld=gold cc=bfd)"
-LD=ld.gold LDFLAGS=-fuse-ld=bfd tc-ld-is-gold
-ret=$?
-tend ${ret}
-
-tbegin "tc-ld-is-gold (ld=bfd cc=gold)"
-LD=ld.bfd LDFLAGS=-fuse-ld=gold tc-ld-is-gold
-ret=$?
-tend ${ret}
+if type -P ld.gold &>/dev/null; then
+       tbegin "tc-ld-is-gold (ld=gold cc=default)"
+       LD=ld.gold tc-ld-is-gold
+       ret=$?
+       tend ${ret}
+
+       tbegin "tc-ld-is-gold (ld=gold cc=bfd)"
+       LD=ld.gold LDFLAGS=-fuse-ld=bfd tc-ld-is-gold
+       ret=$?
+       tend ${ret}
+
+       tbegin "tc-ld-is-gold (ld=bfd cc=gold)"
+       LD=ld.bfd LDFLAGS=-fuse-ld=gold tc-ld-is-gold
+       ret=$?
+       tend ${ret}
+fi
 
 #
 # TEST: tc-ld-disable-gold
@@ -87,23 +89,25 @@ tc-ld-disable-gold
 )
 tend $?
 
-tbegin "tc-ld-disable-gold (ld=gold)"
-(
-export LD=ld.gold LDFLAGS=
-ewarn() { :; }
-tc-ld-disable-gold
-[[ ${LD} == "ld.bfd" || ${LDFLAGS} == *"-fuse-ld=bfd"* ]]
-)
-tend $?
+if type -P ld.gold &>/dev/null; then
+       tbegin "tc-ld-disable-gold (ld=gold)"
+       (
+       export LD=ld.gold LDFLAGS=
+       ewarn() { :; }
+       tc-ld-disable-gold
+       [[ ${LD} == "ld.bfd" || ${LDFLAGS} == *"-fuse-ld=bfd"* ]]
+       )
+       tend $?
 
-tbegin "tc-ld-disable-gold (cc=gold)"
-(
-export LD= LDFLAGS="-fuse-ld=gold"
-ewarn() { :; }
-tc-ld-disable-gold
-[[ ${LD} == *"/ld.bfd" || ${LDFLAGS} == "-fuse-ld=gold -fuse-ld=bfd" ]]
-)
-tend $?
+       tbegin "tc-ld-disable-gold (cc=gold)"
+       (
+       export LD= LDFLAGS="-fuse-ld=gold"
+       ewarn() { :; }
+       tc-ld-disable-gold
+       [[ ${LD} == *"/ld.bfd" || ${LDFLAGS} == "-fuse-ld=gold -fuse-ld=bfd" ]]
+       )
+       tend $?
+fi
 
 unset CPP