--- a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c	Fri May 12 15:09:23 2017 -0700
+++ b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c	Tue May 16 07:17:08 2017 -0700
@@ -424,7 +424,7 @@
          * macosx client library is built thin, i386 only.
          * 64 bit client requests must load server library
          */
-        JLI_Snprintf(jvmpath, jvmpathsize, "%s/lib/server/" JVM_DLL, jrepath);
+        JLI_Snprintf(jvmpath, jvmpathsize, "%s/lib/%s/" JVM_DLL, jrepath, jvmtype);
     }
 
     JLI_TraceLauncher("Does `%s' exist ... ", jvmpath);