From: Stefan Ring <stefan@complang.tuwien.ac.at>
Date: Thu, 16 Dec 2010 21:26:54 +0000 (+0100)
Subject: PR123: LD_LIBRARY_PATH and java.library.path
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=commitdiff_plain;h=6bae923101631eaa6c920566382e9f70426635e3

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 cb49e96ac..985791cbe 100644
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -332,6 +332,14 @@ Properties::Properties()
 		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. */
@@ -361,14 +369,6 @@ Properties::Properties()
 
 	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)