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/g++.dg/compat | |
| 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/g++.dg/compat')
| -rw-r--r-- | gcc/testsuite/g++.dg/compat/compat.exp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp index df8dac96992..5128273be41 100644 --- a/gcc/testsuite/g++.dg/compat/compat.exp +++ b/gcc/testsuite/g++.dg/compat/compat.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,25 +35,7 @@ global ld_library_path # Load procedures from common libraries. load_lib standard.exp load_lib g++.exp - -# -# compat-fix-library-path -- switch LD_LIBRARY_PATH -# -proc compat-fix-library-path { } { - global ld_library_path - - # See comments in lib/g++.exp for why this is needed. - if {![is_remote target]} { - # See comments in lib/g++.exp for why this is needed. - 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 - } -} +load_lib target-libpath.exp # # compat-use-alt-compiler -- make the alternate compiler the default @@ -72,7 +54,7 @@ proc compat-use-alt-compiler { } { set CXXFLAGS "" set ALWAYS_CXXFLAGS "" set ld_library_path $alt_ld_library_path - compat-fix-library-path + set_ld_library_path_env_vars } } @@ -94,7 +76,7 @@ proc compat-use-tst-compiler { } { set CXXFLAGS $save_cxxflags set ALWAYS_CXXFLAGS $save_always_cxxflags set ld_library_path $save_ld_library_path - compat-fix-library-path + set_ld_library_path_env_vars } } |