From: Richard Earnshaw <rearnsha@arm.com>
Date: Sat, 28 Feb 2004 09:40:24 +0000 (+0000)
Subject: g++.exp (g++_link_flags): Don't crash if LD_LIBRARY_PATH is not defined.
X-Git-Tag: releases/gcc-4.0.0~9777
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b922546d0786e081e666d306d403789185da5229;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 980fc9fc06f5..a5dd16bfbef7 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 c3410db5fce2..518e836020c6 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