* lib/g++.exp (g++_link_flags): Don't crash if LD_LIBRARY_PATH is

not defined.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78604 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 980fc9f..a5dd16b 100644 (file)
--- 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 (file)
--- 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