From c629a5c75dc88499bcacf3fea2104db8a4816e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Tue, 3 Oct 2023 14:07:48 +0200
Subject: [PATCH] Ensure jimage static jdk library get statically linked

---
 .../src/com/oracle/svm/hosted/jdk/JRTFeature.java               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JRTFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JRTFeature.java
index 0efa8ce18fa5..1aece66a616e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JRTFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JRTFeature.java
@@ -28,6 +28,7 @@
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.jdk.NativeLibrarySupport;
 import com.oracle.svm.hosted.FeatureImpl;
 
 @AutomaticallyRegisteredFeature
@@ -37,6 +38,7 @@ public class JRTFeature implements InternalFeature {
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         access.registerReachabilityHandler(duringAnalysisAccess -> {
             FeatureImpl.BeforeAnalysisAccessImpl beforeAnalysisAccess = (FeatureImpl.BeforeAnalysisAccessImpl) access;
+            NativeLibrarySupport.singleton().preregisterUninitializedBuiltinLibrary("jimage");
             beforeAnalysisAccess.getNativeLibraries().addStaticJniLibrary("jimage");
             if (!Platform.includedIn(Platform.WINDOWS.class)) {
                 beforeAnalysisAccess.getNativeLibraries().addDynamicNonJniLibrary("stdc++");