Skip to content

Commit

Permalink
[JDK 22/23] Fix installation/copy of svm-foreign.jar
Browse files Browse the repository at this point in the history
(cherry picked from commit c5132cb)
  • Loading branch information
jerboaa authored and zakkak committed Feb 7, 2024
1 parent 56aad8f commit b28fd12
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions build.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
FileSystem.copy(mandrelRepo.resolve(
Path.of("substratevm", "mxbuild", JDK_VERSION, "dists", JDK_VERSION, "svm-foreign.jar")), svmForeign);
}

if (!options.skipNative)
Expand Down Expand Up @@ -975,7 +971,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(
Expand Down

0 comments on commit b28fd12

Please sign in to comment.