mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 08:00:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

libgomp-dg.exp (libgomp_init): Compute multilib-related part of LD_LIBRARY_PATH manually.

Browse Source 
* testsuite/lib/libgomp-dg.exp (libgomp_init): Compute multilib-related
	part of LD_LIBRARY_PATH manually.

From-SVN: r110720
This commit is contained in:
Eric Botcazou 2006-02-07 22:57:38 +01:00 committed by Eric Botcazou
parent 7127d9c7d1
commit cb2bbc673b
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgomp/ChangeLog
View File

@ -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

25
libgomp/testsuite/lib/libgomp-dg.exp
View File

@ -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 ""