From 4aa1c6b53135a5d10c1f187e89f2a78194a19169 Mon Sep 17 00:00:00 2001
From: mmitchel <mmitchel>
Date: Thu, 24 Mar 2005 23:36:02 +0000
Subject: [PATCH] 	* config/default.exp: Do not load libpath.exp if it
 does not 	exist. 	(CC): Provide fallback definition. 	(CFLAGS):
 Likewise. 	(CXX): Likewise. 	(CXXFLAGS): Likewise.

---
 ld/testsuite/ChangeLog          |  9 +++++++++
 ld/testsuite/config/default.exp | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8b1c4971e1..9833bf26c4 100644
--- 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 b05ae0a10d..9656bfb825 100644
--- 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
-- 
2.11.0