From 9a3e5fd3fd1a6759c5b4cef505d7956067fa8e7c Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 30 Apr 2002 01:45:34 +0000 Subject: [PATCH] libstdc++-v3-dg.exp (libstdc++-v3-init): Set all of LD_LIBRARY_PATH, SHLIB_PATH, LD_LIBRARYN32_PATH, LD_LIBRARY64_PATH. * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Set all of LD_LIBRARY_PATH, SHLIB_PATH, LD_LIBRARYN32_PATH, LD_LIBRARY64_PATH. From-SVN: r52919 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e1b79dbab32..ee41e414966 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-04-29 Rainer Orth + + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Set all + of LD_LIBRARY_PATH, SHLIB_PATH, LD_LIBRARYN32_PATH, + LD_LIBRARY64_PATH. + 2002-04-28 Benjamin Kosnik PR libstdc++/5280 diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index 8d1e71397d9..08fb58e147b 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -69,6 +69,17 @@ proc libstdc++-v3-init { args } { append ld_library_path ":${gccdir}" append ld_library_path ":${blddir}/src/.libs" + # 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. 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 + # Do a bunch of handstands and backflips for cross compiling and # finding simulators... if [is_remote host] {