From cc7c910f3e8acb9148a644c85fba44e4a8cca171 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 6 Feb 2024 18:04:46 +0100 Subject: [PATCH] [JDK 22/23] Fix installation/copy of svm-foreign.jar --- build.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build.java b/build.java index a8e5c16..d63e6b3 100644 --- a/build.java +++ b/build.java @@ -138,10 +138,6 @@ public static void main(String... args) throws IOException FileSystem.copy(mandrelRepo.resolve( Path.of("sdk", "mxbuild", PLATFORM, "native-image.exe.image-bash", "native-image.export-list")), nativeImageExport); } - logger.debugf("Copy svm-preview..."); - final Path svmForeign = mandrelJavaHome.resolve(Path.of("lib", "svm-preview", "builder", "svm-foreign.jar")); - final Path svmForeignSource = PathFinder.getFirstExisting(mandrelRepo.resolve(Path.of("substratevm", "mxbuild")).toString(), "svm-foreign.jar"); - FileSystem.copy(svmForeignSource, svmForeign); } if (!options.skipNative) @@ -949,7 +945,9 @@ class Mx new SimpleEntry<>("org.graalvm.nativeimage:svm-diagnostics-agent.jar", new Path[]{substrateDistPath.resolve("svm-diagnostics-agent.jar"), Path.of("lib", "graalvm", "svm-diagnostics-agent.jar")}), new SimpleEntry<>("org.graalvm.nativeimage:svm-configure.jar", - new Path[]{substrateDistPath.resolve("svm-configure.jar"), Path.of("lib", "graalvm", "svm-configure.jar")}) + new Path[]{substrateDistPath.resolve("svm-configure.jar"), Path.of("lib", "graalvm", "svm-configure.jar")}), + new SimpleEntry<>("org.graalvm.nativeimage:svm-foreign.jar", + new Path[]{substrateDistPath.resolve("svm-foreign.jar"), Path.of("lib", "svm", "builder", "svm-foreign.jar")}) ); macroPaths = Map.ofEntries(