[GR-38179] Load JLI library on osx for AWT

PullRequest: graal/11735

Author: matneu

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -2730,6 +2730,14 @@ def cflags(self):
             '-DLIBJVM_RELPATH=' + _libjvm_path,
         ]
 
+        # path to libjli - only needed on osx for AWT
+        if mx.is_darwin():
+            _libjli_path = join(_dist.path_substitutions.substitute('<jre_base>'), 'lib', mx.add_lib_suffix("libjli"))
+            _libjli_path = relpath(_libjli_path, start=_exe_dir)
+            _dynamic_cflags += [
+                '-DLIBJLI_RELPATH=' + _libjli_path,
+            ]
+
         # path to native image language library - this is set even if the library is not built, as it may be built after the fact
         if self.jvm_launcher:
             # since this distribution has no native library, we can only assume the default path: language_home/lib<lang>vm.so

sdk/src/org.graalvm.launcher.native/src/launcher.cc

@@ -109,6 +109,12 @@
     #include <mach-o/dyld.h>
     #include <sys/syslimits.h>
     #include <sys/stat.h>
+
+    #ifndef LIBJLI_RELPATH
+        #error path to jli library undefined
+    #endif
+    #define LIBJLI_RELPATH_STR STR(LIBJLI_RELPATH)
+
 #elif defined (_WIN32)
     #include <windows.h>
     #include <libloaderapi.h>
@@ -189,6 +195,19 @@ std::string exe_directory() {
     return exeDir;
 }
 
+#if defined (__APPLE__)
+/* Load libjli - this is needed on osx for libawt, which uses JLI_* methods.
+ * If the GraalVM libjli is not loaded, the osx linker will look up the symbol
+ * via the JavaRuntimeSupport.framework (JRS), which will fall back to the
+ * system JRE and fail if none is installed
+ */
+void *load_jli_lib(std::string exeDir) {
+    std::stringstream libjliPath;
+    libjliPath << exeDir << DIR_SEP_STR << LIBJLI_RELPATH_STR;
+    return dlopen(libjliPath.str().c_str(), RTLD_NOW);
+}
+#endif
+
 /* load the language library (either native library or libjvm) and return a
  * pointer to the JNI_CreateJavaVM function */
 CreateJVM load_vm_lib(std::string liblangPath) {
@@ -362,6 +381,15 @@ int main(int argc, char *argv[]) {
         }
     }
 
+#if defined (__APPLE__)
+    if (jvmMode) {
+        if (!load_jli_lib(exeDir)) {
+            std::cerr << "Loading libjli failed." << std::endl;
+            return -1;
+        }
+    }
+#endif
+
     /* parse VM args */
     JavaVM *vm;
     JNIEnv *env;