at master 1.7 kB view raw
1diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp 2index c477851c1b..ff5e28d95b 100644 3--- a/hotspot/src/os/linux/vm/os_linux.cpp 4+++ b/hotspot/src/os/linux/vm/os_linux.cpp 5@@ -368,13 +368,13 @@ void os::init_system_properties_values() { 6 // ... 7 // 7: The default directories, normally /lib and /usr/lib. 8 #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390)) 9-#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" 10+#define DEFAULT_LIBPATH "" 11 #else 12-#define DEFAULT_LIBPATH "/lib:/usr/lib" 13+#define DEFAULT_LIBPATH "" 14 #endif 15 16 // Base path of extensions installed on the system. 17-#define SYS_EXT_DIR "/usr/java/packages" 18+#define SYS_EXT_DIR "" 19 #define EXTENSIONS_DIR "/lib/ext" 20 #define ENDORSED_DIR "/lib/endorsed" 21 22@@ -437,13 +437,13 @@ void os::init_system_properties_values() { 23 strlen(v) + 1 + 24 sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1, 25 mtInternal); 26- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch); 27+ sprintf(ld_library_path, "%s", v); 28 Arguments::set_library_path(ld_library_path); 29 FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal); 30 } 31 32 // Extensions directories. 33- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); 34+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); 35 Arguments::set_ext_dirs(buf); 36 37 // Endorsed standards default directory.