* lib/ld-lib.exp (default_ld_simple_link): Trim ld path before

	looking for gcc match.
	(default_ld_compile): Likewise for cc.

2 files changed, 10 insertions, 2 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 401c020..413546f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* lib/ld-lib.exp (default_ld_simple_link): Trim ld path before
+	looking for gcc match.
+	(default_ld_compile): Likewise for cc.
+
 2003-06-17  Loren James Rittle  <rittle@latour.rsch.comm.mot.com>
 
 	* ld-undefined/undefined.exp (i?86-*-freebsd*): Remove xfail.
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 23e4f69..33d449d 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -170,7 +170,8 @@ proc default_ld_simple_link { ld target objects } {
     # If we are compiling with gcc, we want to add gcc_ld_flag to
     # flags.  Rather than determine this in some complex way, we guess
     # based on the name of the compiler.
-    if {[string match "*gcc*" $ld] || [string match "*++*" $ld]} then {
+    set ldexe [string replace $ld 0 [string last "/" $ld] ""]
+    if {[string match "*gcc*" $ldexe] || [string match "*++*" $ldexe]} then {
 	set flags "$gcc_ld_flag $flags"
     }
 
@@ -218,7 +219,8 @@ proc default_ld_compile { cc source object } {
     # If we are compiling with gcc, we want to add gcc_gas_flag to
     # flags.  Rather than determine this in some complex way, we guess
     # based on the name of the compiler.
-    if {[string match "*gcc*" $cc] || [string match "*++*" $cc]} then {
+    set ccexe [string replace $cc 0 [string last "/" $cc] ""]
+    if {[string match "*gcc*" $ccexe] || [string match "*++*" $ccexe]} then {
 	set flags "$gcc_gas_flag $flags"
     }