From c91de77a9d108d710d5de3dc8a1cf8df014a5f60 Mon Sep 17 00:00:00 2001
From: Andreas Tobler <a.tobler@schweiz.ch>
Date: Mon, 12 Jan 2004 21:47:44 +0100
Subject: [PATCH] libstdc++.exp: Set LD_LIBRARY_PATH_32 for Solaris.
2004-01-10 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libstdc++.exp: Set LD_LIBRARY_PATH_32 for
Solaris.
From-SVN: r75759
---
libstdc++-v3/ChangeLog | 5 ++++
libstdc++-v3/testsuite/lib/libstdc++.exp | 29 +++++++++++++++---------
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d58240f7e1d..7ffeb3b23b93 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-12 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * testsuite/lib/libstdc++.exp: Set LD_LIBRARY_PATH_32 for
+ Solaris.
+
2004-01-12 Paolo Carlini <pcarlini@suse.de>
* testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc:
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 9aacdb28b838..d6b4dc8d3925 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -65,16 +65,20 @@ proc v3-init { args } {
# Find the existing LD_LIBRARY_PATH.
if [info exists env(LD_LIBRARY_PATH)] {
set original_ld_library_path $env(LD_LIBRARY_PATH)
+ # For HP-UX
+ } elseif [info exists env(SHLIB_PATH)] {
+ set original_ld_library_path $env(SHLIB_PATH)
+ # For Darwin:
+ } elseif [info exists env(DYLD_LIBRARY_PATH)] {
+ set original_ld_library_path $env(DYLD_LIBRARY_PATH)
+ # For Solaris 32 bit:
+ } elseif [info exists env(LD_LIBRARY_PATH_32)] {
+ set original_ld_library_path $env(LD_LIBRARY_PATH_32)
+ # For Solaris 64 bit:
+ } elseif [info exists env(LD_LIBRARY_PATH_64)] {
+ set original_ld_library_path $env(LD_LIBRARY_PATH_64)
} else {
- if [info exists env(SHLIB_PATH)] {
- set original_ld_library_path $env(SHLIB_PATH)
- } else {
- if [info exists env(DYLD_LIBRARY_PATH)] {
- set original_ld_library_path $env(DYLD_LIBRARY_PATH)
- } else {
- set original_ld_library_path ""
- }
- }
+ set original_ld_library_path ""
}
# Locate libgcc.a so we don't need to account for different values of
@@ -107,13 +111,16 @@ proc v3-init { args } {
# 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.
+ # proper, so we do it here.
+ # The same applies to darwin (DYLD_LIBRARY_PATH), solaris 32 bit
+ # (LD_LIBRARY_PATH_32), solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX
+ # (SHLIB_PATH).
setenv LD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path"
setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
setenv LD_LIBRARYN32_PATH "$ld_library_path:$original_ld_library_path"
setenv LD_LIBRARY64_PATH "$ld_library_path:$original_ld_library_path"
setenv LD_RUN_PATH "$ld_library_path:$original_ld_library_path"
+ setenv LD_LIBRARY_PATH_32 "$ld_library_path:$original_ld_library_path"
setenv LD_LIBRARY_PATH_64 "$ld_library_path:$original_ld_library_path"
setenv DYLD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path"
verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
--
GitLab