* config/default.exp: Do not load libpath.exp if it does not

	exist.
	(CC): Provide fallback definition.
	(CFLAGS): Likewise.
	(CXX): Likewise.
	(CXXFLAGS): Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8b1c4971e1646ee4436fe1a8685632e0da637ce1..9833bf26c4995cdb002621b80151a6cc22c801f0 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-24  Mark Mitchell  <mark@codesourcery.com>
+
+       * config/default.exp: Do not load libpath.exp if it does not
+       exist.
+       (CC): Provide fallback definition.
+       (CFLAGS): Likewise.
+       (CXX): Likewise.
+       (CXXFLAGS): Likewise.
+       
 2005-03-24  Eric Christopher  <echristo@redhat.com>
 
        * ld-mips-elf/rel32-n32.d: Revert changes.

diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp
index b05ae0a10d53f0f6025e1cba41870e60c8808c0a..9656bfb8252aa075d5bc589a9c0480c536af6735 100644 (file)
--- a/ld/testsuite/config/default.exp
+++ b/ld/testsuite/config/default.exp
@@ -70,10 +70,19 @@ if {![file isdirectory tmpdir/ld]} then {
 set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
 
 # load the linker path
-load_lib tmpdir/libpath.exp
+if {[file exists tmpdir/libpath.exp]} {
+    load_lib tmpdir/libpath.exp
 
-foreach dir $libpath {
-    set gcc_ld_flag "$gcc_ld_flag -L$dir"
+    foreach dir $libpath {
+       set gcc_ld_flag "$gcc_ld_flag -L$dir"
+    }
+}
+
+# The "make check" target in the Makefile passes in
+# "CC=$(CC_FOR_TARGET)".  But, if the user invokes runtest directly
+# (as when testing an installed linker), CC may not be set.  
+if {![info exists CC]} {
+    set CC [transform gcc]
 }
 
 # The mips64-*-linux-gnu compiler defaults to the N32 ABI after