aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Earnshaw <rearnsha@arm.com>2004-02-28 09:40:24 +0000
committerRichard Earnshaw <rearnsha@gcc.gnu.org>2004-02-28 09:40:24 +0000
commitb922546d0786e081e666d306d403789185da5229 (patch)
tree63ffcf3eb4861b9f0098cc31eb6a982576f5ea5c
parent68a1a5da2b17865bb90a28ba13a117092b82b608 (diff)
downloadgcc-b922546d0786e081e666d306d403789185da5229.zip
gcc-b922546d0786e081e666d306d403789185da5229.tar.gz
gcc-b922546d0786e081e666d306d403789185da5229.tar.bz2
g++.exp (g++_link_flags): Don't crash if LD_LIBRARY_PATH is not defined.
* lib/g++.exp (g++_link_flags): Don't crash if LD_LIBRARY_PATH is not defined. From-SVN: r78604
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/g++.exp3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 980fc9f..a5dd16b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-28 Richard Earnshaw <rearnsha@arm.com>
+
+ * lib/g++.exp (g++_link_flags): Don't crash if LD_LIBRARY_PATH is
+ not defined.
+
2004-02-27 Eric Christopher <echristo@redhat.com>
* g++.dg/charset/charset.exp: Change CFLAGS to CHARSETCFLAGS.
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index c3410db..518e836 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -177,7 +177,8 @@ proc g++_link_flags { paths } {
# Doing this does cause trouble when testing cross-compilers.
if {![is_remote target]} {
global env;
- if { $env(LD_LIBRARY_PATH) != "" } {
+ if { [info exists env(LD_LIBRARY_PATH)]
+ && $env(LD_LIBRARY_PATH) != "" } {
append ld_library_path ":$env(LD_LIBRARY_PATH)";
}
setenv LD_LIBRARY_PATH $ld_library_path