PR123: LD_LIBRARY_PATH and java.library.path

* src/vm/properties.cpp: Set java.library.path for OpenJDK builds also.

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index cb49e96acbc5db6af3f41ba89675037584ca3c59..985791cbe39236cd50026104d495c10d14a4562a 100644 (file)
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -332,6 +332,14 @@ Properties::Properties()
                put("java.vm.info", "compiled mode");
        }
 
                put("java.vm.info", "compiled mode");
        }
 

+       // Get and set java.library.path.
+       const char* java_library_path = os::getenv("LD_LIBRARY_PATH");
+
+       if (java_library_path == NULL)
+               java_library_path = "";
+
+       put("java.library.path", java_library_path);
+

 # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
        /* Get properties from system. */
 # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
        /* Get properties from system. */


@@ -361,14 +369,6 @@ Properties::Properties()
 
        put("gnu.classpath.boot.library.path", boot_library_path);
 
 
        put("gnu.classpath.boot.library.path", boot_library_path);
 

-       // Get and set java.library.path.
-       const char* java_library_path = os::getenv("LD_LIBRARY_PATH");
-
-       if (java_library_path == NULL)
-               java_library_path = "";
-
-       put("java.library.path", java_library_path);
-

        put("java.io.tmpdir", "/tmp");
 
 #  if defined(ENABLE_INTRP)
        put("java.io.tmpdir", "/tmp");
 
 #  if defined(ENABLE_INTRP)