Use libjli, not libjvm, on macOS

See: * #90
joeferner · Apr 25, 2019 · 09f87ee · 09f87ee
1 parent 2e6ce52
commit 09f87ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -116,7 +116,7 @@
                   'libraries': [
                     '-L<(javalibdir)',
                     '-Wl,-rpath,<(javalibdir)',
-                    '-ljvm'
+                    '-ljli'
                   ],
                 },
               ],

diff --git a/find_java_libdir.sh b/find_java_libdir.sh
@@ -45,7 +45,7 @@ main () {
     target_arch=`uname -m`
     if [[ -d ${jre_dir}/${target_arch}/classic ]]; then lib_dir="${jre_dir}"/${target_arch}/classic; else lib_dir="${jre_dir}"/${target_arch}/server; fi
   elif [[ "${os}" == "mac" ]]; then
-    lib_dir="${jre_dir}/server"
+    lib_dir="${jre_dir}/jli"
   else
     local arch
     if [[ "${target_arch}" =~ (32|386) ]]; then

diff --git a/postInstall.js b/postInstall.js
@@ -11,7 +11,7 @@ require('find-java-home')(function(err, home){
 
   if(home){
     dll = glob.sync('**/jvm.dll', {cwd: home})[0];
-    dylib = glob.sync('**/libjvm.dylib', {cwd: home})[0];
+    dylib = glob.sync('**/libjli.dylib', {cwd: home})[0];
     soFiles = glob.sync('**/libjvm.so', {cwd: home});
 
     if(soFiles.length>0)