Commit dfcb37f2 by Carlo Wood Committed by Jeff Law

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
parent 442b2e86
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) Thu Dec 25 00:34:03 1997 Jeffrey A Law (law@cygnus.com)
* lib/libstdc++.exp (test_libstdc++): Set LD_LIBRARY_PATH * lib/libstdc++.exp (test_libstdc++): Set LD_LIBRARY_PATH
......
...@@ -56,6 +56,7 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args ...@@ -56,6 +56,7 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args
global LIBSTDCPP global LIBSTDCPP
global srcdir subdir objdir global srcdir subdir objdir
global TOOL_OPTIONS global TOOL_OPTIONS
global ld_library_path
if [info exists LIBSTDCPP] { if [info exists LIBSTDCPP] {
set libstdcpp $LIBSTDCPP; set libstdcpp $LIBSTDCPP;
...@@ -81,15 +82,12 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args ...@@ -81,15 +82,12 @@ proc test_libstdc++ { options srcfile compile_args inpfile resultfile exec_args
regsub -all -- "-L" $libstdcpp "" ld_library_path regsub -all -- "-L" $libstdcpp "" ld_library_path
# Then remove any -lstdc++ argument. # 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. # That's enough to make things work for the normal case.
# If we wanted to handle an arbitrary value of libstdcpp, # If we wanted to handle an arbitrary value of libstdcpp,
# then we'd have to do a lot more work. # 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 != "" } { if { $compile_args != "" } {
lappend args "additional_flags=$compile_args" lappend args "additional_flags=$compile_args"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment