diff options
Diffstat (limited to 'libmudflap')
| -rw-r--r-- | libmudflap/ChangeLog | 6 | ||||
| -rw-r--r-- | libmudflap/testsuite/lib/libmudflap.exp | 25 |
2 files changed, 9 insertions, 22 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 2a23b8d6539..11d6f525f40 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,9 @@ +2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com> + + * testsuite/lib/libmudflap.exp (libmudflap-init): Don't add "." + to ld_library_path. Use add_path. Add just find_libgcc_s to + ld_library_path, not every libgcc multilib directory. + 2009-04-09 Nick Clifton <nickc@redhat.com> * mf-hooks1.c: Change copyright header to refer to version 3 diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index c69e84ade29..da91643a7b2 100644 --- a/libmudflap/testsuite/lib/libmudflap.exp +++ b/libmudflap/testsuite/lib/libmudflap.exp @@ -60,28 +60,9 @@ proc libmudflap-init { language } { # set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found. # locate libgcc.a so we don't need to account for different values of # SHLIB_EXT on different platforms - set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] - if {$gccdir != ""} { - set gccdir [file dirname $gccdir] - } - - set ld_library_path "." - append ld_library_path ":${gccdir}" - append ld_library_path ":${cxxblddir}/src/.libs" - if {[is_remote host] == 0} { - foreach i "[exec ${gccdir}/xgcc --print-multi-lib]" { - set mldir "" - regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir - set mldir [string trimright $mldir "\;@"] - if { "$mldir" == "." } { - continue - } - if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } { - append ld_library_path ":${gccdir}/${mldir}" - } - } - } - append ld_library_path ":${blddir}/.libs" + set ld_library_path [find_libgcc_s $cxx] + add_path ld_library_path "${cxxblddir}/src/.libs" + add_path ld_library_path "${blddir}/.libs" set libs "-L${blddir}/.libs" set cxxflags "-ggdb3 -DDEBUG_ASSERT" |