re PR other/12009 (g++.dg, compat.exp fail to crosscompile testcases)

	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.

Co-Authored-By: Dan Kegel <dank@kegel.com>
From-SVN: r74789

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 009c8e9c691114d1cf5a08a3cfd805d88ebf7858..2adba02f1a9ac7e134eeff4248cd512a6be15a75 100644 (file)
--- 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 1adb4569c6da07ebe528f895456ff5381aac52c9..94da38c77de764b3741025b455919b51427e0423 100644 (file)
--- 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 1fcc38f9fa275264d8671f43df6940a301a81f0a..8b30b60af14d1cc263eb0770dacca5fd13368726 100644 (file)
--- 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"
 }