From: Aldy Hernandez <aldyh@redhat.com>
Date: Fri, 27 Feb 2004 22:05:51 +0000 (+0000)
Subject: g++.exp (g++_link_flags): Append LD_LIBRARY_PATH to ld_library_path.
X-Git-Tag: releases/gcc-4.0.0~9788
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab8eb57319316b02c2fbf17b491cdeb09424872;p=thirdparty%2Fgcc.git

g++.exp (g++_link_flags): Append LD_LIBRARY_PATH to ld_library_path.

2004-02-27  Aldy Hernandez  <aldyh@redhat.com>

	* lib/g++.exp (g++_link_flags): Append LD_LIBRARY_PATH to
	ld_library_path.

From-SVN: r78581
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8bd8ebd0728..b1ef10f6ec98 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-27  Aldy Hernandez  <aldyh@redhat.com>
+
+	* lib/g++.exp (g++_link_flags): Append LD_LIBRARY_PATH to
+	ld_library_path.
+
 2004-02-27  Ziemowit Laski  <zlaski@apple.com>
 
 	* g++.dg/ext/altivec-3.C: New.
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index a9f99fa26d85..c3410db5fce2 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -176,6 +176,10 @@ proc g++_link_flags { paths } {
     # (SHLIB_PATH).
     # Doing this does cause trouble when testing cross-compilers.
     if {![is_remote target]} {
+	global env;
+	if { $env(LD_LIBRARY_PATH) != "" } {
+		append ld_library_path ":$env(LD_LIBRARY_PATH)";
+	}
 	setenv  LD_LIBRARY_PATH     $ld_library_path
 	setenv  SHLIB_PATH          $ld_library_path
 	setenv  LD_LIBRARYN32_PATH  $ld_library_path