From 334c4aae758ffd526c9c43f433033127dbc89387 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 3 Nov 2000 20:33:47 +0000 Subject: [PATCH] g++.exp (g++_set_ld_library_path): New function. * lib/g++.exp (g++_set_ld_library_path): New function. Use it to set LD_LIBRARYN32_PATH and LD_LIBRARY64_PATH. From-SVN: r37234 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/g++.exp | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 12fce882d9c..3644d57d19f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 3 13:32:14 2000 Mark P Mitchell + + * lib/g++.exp (g++_set_ld_library_path): New function. + Use it to set LD_LIBRARYN32_PATH and LD_LIBRARY64_PATH. + 2000-11-03 Bernd Schmidt * gcc.dg/sequence-pt-1.c: A few new tests. Unify output for bogus diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 8fe1f2a4c4a..e30df4210b1 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -293,6 +293,20 @@ if { [info procs prune_warnings] == "" } then { } } +# 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 g++_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 g++_set_ld_library_path + # Utility used by mike-g++.exp and old-dejagnu.exp. # Check the compiler(/assembler/linker) output for text indicating that # the testcase should be marked as "unsupported". -- 2.30.2