libstdc++.exp: Use global variable ld_library_path (not local) that is a lot more...

        * lib/libstdc++.exp: Use global variable ld_library_path (not local)
	that is a lot more persistent; dejagnu-980528 needs this.
	* lib/libstdc++.exp (test_stdc++): Use regular expression " -lstdc.."
	to remove -lstdc++ arguments (not " -lstdc.*").

From-SVN: r20768

diff --git a/libstdc++/testsuite/ChangeLog b/libstdc++/testsuite/ChangeLog
index 84d8290c719432c6b76201df1cc96382b2056acf..2e4fd608ff7a05adedb86b575a4a14c7b589569a 100644 (file)
--- a/libstdc++/testsuite/ChangeLog
+++ b/libstdc++/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jun 28 00:00:10 1998   Carlo Wood  <carlo@runaway.xs4all.nl>
+
+        * lib/libstdc++.exp: Use global variable ld_library_path (not local)
+       that is a lot more persistent; dejagnu-980528 needs this.
+       * lib/libstdc++.exp (test_stdc++): Use regular expression " -lstdc.."
+       to remove -lstdc++ arguments (not " -lstdc.*").
+
 Thu Dec 25 00:34:03 1997  Jeffrey A Law  (law@cygnus.com)
 
        * lib/libstdc++.exp (test_libstdc++): Set LD_LIBRARY_PATH

diff --git a/libstdc++/testsuite/lib/libstdc++.exp b/libstdc++/testsuite/lib/libstdc++.exp
index f9bcdf43602c9f47d2a3ecc9e44f0d7b0160ac1d..3333ddad6c781966709acce20a577173eb3d87c5 100644 (file)
--- a/libstdc++/testsuite/lib/libstdc++.exp
+++ b/libstdc++/testsuite/lib/libstdc++.exp
@@ -56,6 +56,7 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args
     global LIBSTDCPP
     global srcdir subdir objdir
     global TOOL_OPTIONS
+    global ld_library_path
 
     if [info exists LIBSTDCPP] {
        set libstdcpp $LIBSTDCPP;
@@ -81,15 +82,12 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args
     regsub -all -- "-L" $libstdcpp "" ld_library_path
 
     # Then remove any -lstdc++ argument.
-    regsub -all -- " -lstdc.*" $ld_library_path "" ld_library_path
+    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"
     }