diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/compat/compat.exp | 12 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 13 |
3 files changed, 23 insertions, 10 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 009c8e9..2adba02 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2003-12-18 Steven Bosscher <steven@gcc.gnu.org> + Dan Kegel <dank@kegel.com> + + PR other/12009 + * g++.dg/compat/compat.exp: Do not set LD_LIBRARY_PATH when + testing a cross compiler, it causes spurious compile failures. + * lib/g++.exp: Likewise. + 2003-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> PR c++/13262 diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp index 1adb456..94da38c 100644 --- a/gcc/testsuite/g++.dg/compat/compat.exp +++ b/gcc/testsuite/g++.dg/compat/compat.exp @@ -43,11 +43,13 @@ proc compat-fix-library-path { } { global ld_library_path # 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 DYLD_LIBRARY_PATH $ld_library_path + 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 + } } # diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 1fcc38f..8b30b60 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -172,11 +172,14 @@ proc g++_link_flags { paths } { # unix.exp -- but that's not an option since it's part of DejaGNU # proper, so we do it here. We really only need to do # this on IRIX, but it shouldn't hurt to do it anywhere else. - 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 DYLD_LIBRARY_PATH $ld_library_path + # Doing this does cause trouble when testing cross-compilers. + if {![is_remote target]} { + 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 DYLD_LIBRARY_PATH $ld_library_path + } return "$flags" } |