From 22dc9b64f11229820a36a2b084ffa7ead6dac016 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 18 Feb 2025 14:36:56 +0100 Subject: [PATCH] Add nativeimage-libgraal to module path for non-jlinked JDKs --- .../src/com/oracle/svm/driver/NativeImage.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java index 0b7eb0fea53c..6c6e95894a73 100644 --- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java +++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java @@ -646,12 +646,13 @@ public List getBuilderJavaArgs() { */ public List getBuilderModulePath() { List result = new ArrayList<>(); - // Non-jlinked JDKs need truffle and word, collections, nativeimage on the - // module path since they don't have those modules as part of the JDK. Note - // that graal-sdk is now obsolete after the split in GR-43819 (#7171) + // Non-jlinked JDKs need truffle and word, collections, nativeimage, + // nativeimage-libgraal on the module path since they don't have those + // modules as part of the JDK. Note that graal-sdk is now obsolete + // after the split in GR-43819 (#7171) if (libJvmciDir != null) { result.addAll(getJars(libJvmciDir, "enterprise-graal")); - result.addAll(getJars(libJvmciDir, "word", "collections", "nativeimage")); + result.addAll(getJars(libJvmciDir, "word", "collections", "nativeimage", "nativeimage-libgraal")); } if (modulePathBuild) { result.addAll(createTruffleBuilderModulePath());