diff options
| author | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-24 04:39:41 +0000 |
|---|---|---|
| committer | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-24 04:39:41 +0000 |
| commit | c0e3142700d37457c294280f86353edce3c19534 (patch) | |
| tree | 01527763d9092da3909d80b1b0942d2439662fc2 /gcc/testsuite/lib/gfortran.exp | |
| parent | 92ebe7d37e9c6695bc5060d58f199eab38e9cc41 (diff) | |
| download | gcc-c0e3142700d37457c294280f86353edce3c19534.tar.gz | |
* lib/target-libpath.exp: New file defining set_ld_library_path_env_vars
and restore_ld_library_path_env_vars.
* g++.dg/compat/compat.exp, lib/g++.exp, lib/gcc-dg.exp,
lib/gfortran.exp, lib/objc.exp, lib/treelang.exp: Use new procs.
* ada/acats/run_acats (LD_LIBRARY_PATH): Add previous LD_LIBRARY_PATH
to LD_LIBRARY_PATH. Export LD_LIBRARY_PATH.
* testsuite/lib/libffi-dg.exp: Use new procs in target-libpath.exp.
* testsuite/lib/libjava.exp,
testsuite/libjava.jacks/jacks.exp: Use new procs in target-libpath.exp.
* testsuite/lib/libmudflap.exp: Use new procs in target-libpath.exp.
* testsuite/lib/libstdc++.exp: Use new procs in target-libpath.exp.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91137 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/lib/gfortran.exp')
| -rw-r--r-- | gcc/testsuite/lib/gfortran.exp | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp index 1207d2b572b..95af06a10d1 100644 --- a/gcc/testsuite/lib/gfortran.exp +++ b/gcc/testsuite/lib/gfortran.exp @@ -24,6 +24,7 @@ # load_lib prune.exp load_lib gcc-defs.exp +load_lib target-libpath.exp # # GFORTRAN_UNDER_TEST is the compiler under test. @@ -110,36 +111,7 @@ proc gfortran_link_flags { paths } { } } - # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but - # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH - # (for the 64-bit ABI). The right way to do this would be to modify - # unix.exp -- but that's not an option since it's part of DejaGNU - # proper, so we do it here. - # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit - # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX - # (SHLIB_PATH). - # Doing this does cause trouble when testing cross-compilers. - if {![is_remote target]} { - global env; - 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 - setenv LD_LIBRARY64_PATH $ld_library_path - setenv LD_LIBRARY_PATH_32 $ld_library_path - setenv LD_LIBRARY_PATH_64 $ld_library_path - setenv DYLD_LIBRARY_PATH $ld_library_path - } + set_ld_library_path_env_vars return "$flags" } |