[PATCH] [tree-ssa] [gfortran] update testsuite/lib/gfortran.exp for LD_LIBRARY_PATH part

[Andrew Pinski]

This is just a sync from g++.exp for the LD_LIBRARY part of 
gfortran.exp.
This also fixes the testsuite on Darwin to find the shared library and 
some
other targets too.

OK?

Thanks,
Andrew Pinski


ChangeLog:

	* lib/gfortran.exp: Sync LD_LIBRARY_PATH part from
	lib/g++.exp.


Patch:

Index: lib/gfortran.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/Attic/gfortran.exp,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 gfortran.exp
--- lib/gfortran.exp	26 Jul 2003 16:27:50 -0000	1.1.2.1
+++ lib/gfortran.exp	3 Apr 2004 01:43:22 -0000
@@ -114,12 +114,25 @@ proc gfortran_link_flags { paths } {
      # 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
+    # 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).
+    # Doing this does cause trouble when testing cross-compilers.
+    if {![is_remote target]} {
+        global env;
+        if { [info exists env(LD_LIBRARY_PATH)]
+             && $env(LD_LIBRARY_PATH) != "" } {
+                append ld_library_path ":$env(LD_LIBRARY_PATH)";
+        }
+        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  LD_LIBRARY_PATH_32  $ld_library_path
+        setenv  LD_LIBRARY_PATH_64  $ld_library_path
+        setenv  DYLD_LIBRARY_PATH   $ld_library_path
+    }

      return "$flags"
  }