Skip to content

Commit 14e7f83

Browse files
committed
Add support for building native-image-diagnostics-agent on module-path
1 parent 3cb7039 commit 14e7f83

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

compiler/mx.compiler/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2176,7 +2176,7 @@
21762176
"org.graalvm.compiler.options to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport",
21772177
"org.graalvm.compiler.phases.common to org.graalvm.nativeimage.agent.tracing",
21782178
"org.graalvm.compiler.phases.common.jmx to jdk.internal.vm.compiler.management",
2179-
"org.graalvm.compiler.serviceprovider to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase",
2179+
"org.graalvm.compiler.serviceprovider to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",
21802180
"org.graalvm.compiler.truffle.jfr to jdk.internal.vm.compiler.truffle.jfr",
21812181
"org.graalvm.libgraal to jdk.internal.vm.compiler.management",
21822182
"org.graalvm.util to jdk.internal.vm.compiler.management",

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@ def _native_image_launcher_extra_jvm_args():
853853
],
854854
),
855855
mx_sdk_vm.LibraryConfig(
856+
use_modules='image' if USE_NI_JPMS else 'launcher' if not svm_java8() else None,
856857
destination="<lib:native-image-diagnostics-agent>",
857858
jvm_library=True,
858859
jar_distributions=[

0 commit comments

Comments
 (0)