Skip to content

Commit 6a03e4d

Browse files
committed
Building driver into image requires JRTFileSystem support
1 parent b30d3b8 commit 6a03e4d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,7 @@ def _native_image_launcher_extra_jvm_args():
10121012
'--initialize-at-build-time=com.oracle.svm.driver',
10131013
'--link-at-build-time=com.oracle.svm.driver,com.oracle.svm.driver.metainf',
10141014
] + svm_experimental_options([
1015+
'-H:+AllowJRTFileSystem',
10151016
'-H:IncludeResources=com/oracle/svm/driver/launcher/.*',
10161017
'-H:-ParseRuntimeOptions',
10171018
f'-R:MaxHeapSize={256 * 1024 * 1024}',

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
9898

9999
// region Enable jimage/jrtfs
100100

101-
@TargetClass(className = "jdk.internal.jimage.ImageReader", innerClass = "SharedImageReader")
101+
@TargetClass(className = "jdk.internal.jimage.ImageReader", innerClass = "SharedImageReader", onlyWith = JRTEnabled.class)
102102
final class Target_jdk_internal_jimage_ImageReader_SharedImageReader_JRTEnabled {
103103
@Alias //
104104
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = HashMap.class, isFinal = true) //

0 commit comments

Comments
 (0)