libstdc++.exp (test_libstdc++): Set LD_LIBRARY_PATH and SHLIB_PATH appropriately.

        * lib/libstdc++.exp (test_libstdc++): Set LD_LIBRARY_PATH
        and SHLIB_PATH appropriately.

From-SVN: r17234

diff --git a/libstdc++/testsuite/ChangeLog b/libstdc++/testsuite/ChangeLog
index 886f8b0a6851d507dbe839692f9b75dee15df125..84d8290c719432c6b76201df1cc96382b2056acf 100644 (file)
--- a/libstdc++/testsuite/ChangeLog
+++ b/libstdc++/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 25 00:34:03 1997  Jeffrey A Law  (law@cygnus.com)
+
+       * lib/libstdc++.exp (test_libstdc++): Set LD_LIBRARY_PATH
+       and SHLIB_PATH appropriately.
+
 Wed Sep  3 09:39:36 1997  Jeffrey A Law  (law@cygnus.com)
 
        * lib/libstdc++.exp: Remove libg++_link_flags.

diff --git a/libstdc++/testsuite/lib/libstdc++.exp b/libstdc++/testsuite/lib/libstdc++.exp
index 91cd83025b9aa2a977739591e68b3feb6e3e740e..f9bcdf43602c9f47d2a3ecc9e44f0d7b0160ac1d 100644 (file)
--- a/libstdc++/testsuite/lib/libstdc++.exp
+++ b/libstdc++/testsuite/lib/libstdc++.exp
@@ -73,6 +73,23 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args
 
     verbose "using LIBSTDCPP = $libstdcpp" 2
     set args ""
+
+    # Basically we want to build up a colon separated path list from
+    # the value of $libstdcpp.
+
+    # First strip away any -L arguments.
+    regsub -all -- "-L" $libstdcpp "" ld_library_path
+
+    # Then remove any -lstdc++ argument.
+    regsub -all -- " -lstdc.*" $ld_library_path "" ld_library_path
+
+    # That's enough to make things work for the normal case.
+    # If we wanted to handle an arbitrary value of libstdcpp,
+    # then we'd have to do a lot more work.
+
+    # Set variables the dynamic linker looks at.
+    setenv LD_LIBRARY_PATH $ld_library_path
+    setenv SHLIB_PATH $ld_library_path
     if { $compile_args != "" } {
        lappend args "additional_flags=$compile_args"
     }