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 e8bd8ebd07288e7894e2ebb49f7773c281ead478..b1ef10f6ec98678cecee27c79870e72151dfd43c 100644 (file)
--- 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 a9f99fa26d85f35b78a173336c9fff6ee6ee05a9..c3410db5fce2d64bb0b1b76f48271a57136f15ec 100644 (file)
--- 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