aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorRainer Orth <ro@TechFak.Uni-Bielefeld.DE>2001-07-27 12:21:56 +0000
committerRainer Orth <ro@gcc.gnu.org>2001-07-27 12:21:56 +0000
commit08ecdbebab368105c958935c47f6fde5d225e41a (patch)
treebdb33f28f00529578649f74ce56672231922d6c3 /libjava
parente69aa433648e76aed956a30679b38e57352d7e97 (diff)
downloadgcc-08ecdbebab368105c958935c47f6fde5d225e41a.zip
gcc-08ecdbebab368105c958935c47f6fde5d225e41a.tar.gz
gcc-08ecdbebab368105c958935c47f6fde5d225e41a.tar.bz2
g++.exp (g++_set_ld_library_path): Renamed to ${tool}_set_ld_library_path.
gcc/testsuite: * lib/g++.exp (g++_set_ld_library_path): Renamed to ${tool}_set_ld_library_path. Changed caller. * lib/objc.exp (${tool}_set_ld_library_path): New, copied from g++.exp. libjava/testsuite: * lib/libjava.exp (${tool}_set_ld_library_path): New, copied from g++.exp. From-SVN: r44420
Diffstat (limited to 'libjava')
-rw-r--r--libjava/testsuite/ChangeLog5
-rw-r--r--libjava/testsuite/lib/libjava.exp14
2 files changed, 19 insertions, 0 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 4db6167..8889313 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-27 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * lib/libjava.exp (${tool}_set_ld_library_path): New, copied from
+ g++.exp.
+
2001-07-19 Jeff Sturm <jsturm@one-point.com>
* libjava.lang/PR3731.java: New file.
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index ace5f6c..9b45f3c 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -787,6 +787,20 @@ proc default_libjava_version {} {
proc default_libjava_start { } {
}
+# 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, by trickery. We really only need to do
+# this on IRIX, but it shouldn't hurt to do it anywhere else.
+
+proc ${tool}_set_ld_library_path { name element op } {
+ setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH]
+ setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH]
+}
+
+trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path
+
# Local Variables:
# tcl-indent-level:4
# End: