diff options
Diffstat (limited to 'gcc/testsuite/g++.dg/compat/compat.exp')
| -rw-r--r-- | gcc/testsuite/g++.dg/compat/compat.exp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp index 94da38c77de..accd1452d7d 100644 --- a/gcc/testsuite/g++.dg/compat/compat.exp +++ b/gcc/testsuite/g++.dg/compat/compat.exp @@ -35,22 +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 - } -} +load_lib target-libpath.exp # # compat-use-alt-compiler -- make the alternate compiler the default @@ -69,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 } } @@ -91,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 } } |