Merge pull request #3328 from babsingh/osx_jdk8_no_arch

JDK8 OSX <arch> (=amd64) not defined
eclipse-openj9 · Oct 18, 2018 · e448d21 · e448d21
2 parents 0d6badb + ff8036a
commit e448d21
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/runtime/j9vm/jvm.c b/runtime/j9vm/jvm.c
@@ -1096,10 +1096,15 @@ preloadLibraries(void)
 		jrebinBuffer = jvmBufferCat(NULL, jvmBufferData(j9binBuffer));
 	}
 	j9libBuffer = jvmBufferCat(NULL, jvmBufferData(jrebinBuffer));
-#if J9VM_JAVA9_BUILD < 150
+#if !defined(OSX)
+	/* <arch> directory doesn't exist on OSX so j9libBuffer shouldn't
+	 * be truncated on OSX for removing <arch>.
+	 */
+#if (J9VM_JAVA9_BUILD < 150)
 	/* Remove <arch> */
 	truncatePath(jvmBufferData(j9libBuffer));
-#endif /* J9VM_JAVA9_BUILD < 150 */
+#endif /* (J9VM_JAVA9_BUILD < 150) */
+#endif /* !defined(OSX) */
 	j9libvmBuffer = jvmBufferCat(NULL, jvmBufferData(j9binBuffer));
 	j9Buffer = jvmBufferCat(NULL, jvmBufferData(jrebinBuffer));
 	truncatePath(jvmBufferData(j9Buffer));