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

g++.exp (g++_link_flags): Check whether LD_LIBRARY_PATH already contains $ld_library_path.

Browse Source 
* lib/g++.exp (g++_link_flags): Check whether LD_LIBRARY_PATH already
	contains $ld_library_path.
	* lib/gfortran.exp (gfortran_link_flags): Likewise.

From-SVN: r85329
This commit is contained in:
Richard Sandiford 2004-07-30 10:34:12 +00:00 committed by Richard Sandiford
parent e109f49acc
commit 3a15f566e9
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2004-07-30 Richard Sandiford <rsandifo@redhat.com>
* lib/g++.exp (g++_link_flags): Check whether LD_LIBRARY_PATH already
contains $ld_library_path.
* lib/gfortran.exp (gfortran_link_flags): Likewise.
2004-07-29 Richard Henderson <rth@redhat.com>
* g++.dg/template/sizeof8.C: Don't assume 32bit pointers.

13
gcc/testsuite/lib/g++.exp
View File

@ -177,9 +177,16 @@ proc g++_link_flags { paths } {
# Doing this does cause trouble when testing cross-compilers.
if {![is_remote target]} {
global env;
if { [info exists env(LD_LIBRARY_PATH)]
&& $env(LD_LIBRARY_PATH) != "" } {
append ld_library_path ":$env(LD_LIBRARY_PATH)";
if [info exists env(LD_LIBRARY_PATH)] {
# If we've already added these directories once, keep the
# existing path.
if {$ld_library_path == $env(LD_LIBRARY_PATH)
|| [string first $ld_library_path: \
$env(LD_LIBRARY_PATH)] == 0} {
set ld_library_path $env(LD_LIBRARY_PATH)
} elseif { $env(LD_LIBRARY_PATH) != "" } {
append ld_library_path ":$env(LD_LIBRARY_PATH)"
}
}
setenv LD_LIBRARY_PATH $ld_library_path
setenv SHLIB_PATH $ld_library_path

15
gcc/testsuite/lib/gfortran.exp
View File

@ -121,10 +121,17 @@ proc gfortran_link_flags { paths } {
# Doing this does cause trouble when testing cross-compilers.
if {![is_remote target]} {
global env;
if { [info exists env(LD_LIBRARY_PATH)]
&& $env(LD_LIBRARY_PATH) != "" } {
append ld_library_path ":$env(LD_LIBRARY_PATH)";
}
if [info exists env(LD_LIBRARY_PATH)] {
# If we've already added these directories once, keep the
# existing path.
if {$ld_library_path == $env(LD_LIBRARY_PATH)
|| [string first $ld_library_path: \
$env(LD_LIBRARY_PATH)] == 0} {
set ld_library_path $env(LD_LIBRARY_PATH)
} elseif { $env(LD_LIBRARY_PATH) != "" } {
append ld_library_path ":$env(LD_LIBRARY_PATH)"
}
}
setenv LD_LIBRARY_PATH $ld_library_path
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path