gentoo resync : 15.12.2019

1 files changed, 11 insertions, 11 deletions

diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh
index 79ba6fa407b5..1cf124520c3c 100755
--- a/eclass/tests/toolchain-funcs.sh
+++ b/eclass/tests/toolchain-funcs.sh
@@ -54,21 +54,21 @@ tend ${ret}
 #
 # TEST: tc-ld-is-gold
 #
-tbegin "tc-ld-is-gold (bfd selected)"
-LD=ld.bfd tc-ld-is-gold && ret=1 || ret=0
+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 (gold selected)"
+tbegin "tc-ld-is-gold (ld=gold cc=default)"
 LD=ld.gold tc-ld-is-gold
 ret=$?
 tend ${ret}
 
-tbegin "tc-ld-is-gold (bfd selected via flags)"
+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 (gold selected via flags)"
+tbegin "tc-ld-is-gold (ld=bfd cc=gold)"
 LD=ld.bfd LDFLAGS=-fuse-ld=gold tc-ld-is-gold
 ret=$?
 tend ${ret}
@@ -78,14 +78,14 @@ tend ${ret}
 #
 tbegin "tc-ld-disable-gold (bfd selected)"
 (
-export LD=ld.bfd LDFLAGS=
+export LD=ld.bfd LDFLAGS=-fuse-ld=bfd
 ewarn() { :; }
 tc-ld-disable-gold
-[[ ${LD} == "ld.bfd" && -z ${LDFLAGS} ]]
+[[ ${LD} == "ld.bfd" && ${LDFLAGS} == "-fuse-ld=bfd" ]]
 )
 tend $?
 
-tbegin "tc-ld-disable-gold (gold selected)"
+tbegin "tc-ld-disable-gold (ld=gold)"
 (
 export LD=ld.gold LDFLAGS=
 ewarn() { :; }
@@ -94,7 +94,7 @@ tc-ld-disable-gold
 )
 tend $?
 
-tbegin "tc-ld-disable-gold (gold selected via flags)"
+tbegin "tc-ld-disable-gold (cc=gold)"
 (
 export LD= LDFLAGS="-fuse-ld=gold"
 ewarn() { :; }
@@ -172,8 +172,8 @@ if type -P pathcc &>/dev/null; then
 	tend $?
 fi
 
-for compiler in gcc clang; do
-	if type -P ${compielr} &>/dev/null; then
+for compiler in gcc clang not-really-a-compiler; do
+	if type -P ${compiler} &>/dev/null; then
 		tbegin "tc-cpp-is-true ($compiler, defined)"
 		(
 			export CC=${compiler}