diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-07 21:57:38 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-07 21:57:38 +0000 |
| commit | 9992cb6af5449f18efbf9a402a5cd085d4e34e8e (patch) | |
| tree | 41f9669cb954bd27ce14801617ee284d8a90cac5 /libgomp | |
| parent | e672e40a443a61387b0d3c01be6c1ce4aec502ec (diff) | |
| download | gcc-9992cb6af5449f18efbf9a402a5cd085d4e34e8e.tar.gz | |
* testsuite/lib/libgomp-dg.exp (libgomp_init): Compute multilib-related
part of LD_LIBRARY_PATH manually.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110720 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp-dg.exp | 25 |
2 files changed, 25 insertions, 5 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 467629f6184..5a3878e2d21 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-07 Eric Botcazou <ebotcazou@libertysurf.fr> + + * testsuite/lib/libgomp-dg.exp (libgomp_init): Compute multilib related + part of LD_LIBRARY_PATH manually. + 2006-02-03 H.J. Lu <hongjiu.lu@intel.com> PR libgomp/25852 diff --git a/libgomp/testsuite/lib/libgomp-dg.exp b/libgomp/testsuite/lib/libgomp-dg.exp index f6fed67b209..d064a8012c8 100644 --- a/libgomp/testsuite/lib/libgomp-dg.exp +++ b/libgomp/testsuite/lib/libgomp-dg.exp @@ -94,14 +94,29 @@ proc libgomp_init { args } { # Compute what needs to be put into LD_LIBRARY_PATH set ld_library_path ".:${blddir}/.libs" - if {$gccdir != ""} { - append ld_library_path ":${gccdir}" - } - if { [info exists lang_test_file] && [file exists "${blddir}/"] } { append ld_library_path ":${blddir}/${lang_library_path}" } - append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] + + # Compute what needs to be added to the existing LD_LIBRARY_PATH. + if {$gccdir != ""} { + append ld_library_path ":${gccdir}" + set compiler [lindex $GCC_UNDER_TEST 0] + + if { [is_remote host] == 0 && [which $compiler] != 0 } { + foreach i "[exec $compiler --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}" + } + } + } + } set_ld_library_path_env_vars set ALWAYS_CFLAGS "" |