diff options
| author | Carlo Wood <carlo@runaway.xs4all.nl> | 1998-06-28 01:01:34 +0200 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-06-27 17:01:34 -0600 |
| commit | dfcb37f2a7ac5144dfd1b5d484947d21e047c919 (patch) | |
| tree | 2ce84a3666266670e197050d243f70e343fc1825 | |
| parent | 442b2e8635a8cb124d3f5ec6ab2ac8d55a109438 (diff) | |
| download | gcc-dfcb37f2a7ac5144dfd1b5d484947d21e047c919.zip gcc-dfcb37f2a7ac5144dfd1b5d484947d21e047c919.tar.gz gcc-dfcb37f2a7ac5144dfd1b5d484947d21e047c919.tar.bz2 | |
libstdc++.exp: Use global variable ld_library_path (not local) that is a lot more persistent...
* 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
| -rw-r--r-- | libstdc++/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++/testsuite/lib/libstdc++.exp | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++/testsuite/ChangeLog b/libstdc++/testsuite/ChangeLog index 84d8290..2e4fd60 100644 --- 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 f9bcdf4..3333dda 100644 --- 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" } |