From 0f84fde19ee862ccc2f5161fedb9a4f773169e47 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 17 Jun 2003 23:26:57 +0000 Subject: [PATCH] * lib/ld-lib.exp (default_ld_simple_link): Trim ld path before looking for gcc match. (default_ld_compile): Likewise for cc. --- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/lib/ld-lib.exp | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 401c020980..413546f4fe 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2003-06-18 Alan Modra + + * 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 * 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 23e4f698bd..33d449d74f 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" }