Check GraalVM version before returning macos/darwin platform. (#1123)

* Check GraalVM version before returning macos/darwin platform. This closes #1121
gluonhq · Feb 18, 2022 · 3a23d5b · 3a23d5b
1 parent 8214115
commit 3a23d5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/com/gluonhq/substrate/model/InternalProjectConfiguration.java b/src/main/java/com/gluonhq/substrate/model/InternalProjectConfiguration.java
@@ -117,7 +117,7 @@ public Path getGraalPath() {
         return Objects.requireNonNull(this.publicConfig.getGraalPath(), "GraalVM Path is not defined");
     }
 
-    private Version getGraalVersion() throws IOException {
+    public Version getGraalVersion() throws IOException {
         String pattern = "GraalVM .*?(\\d\\d.\\d.\\d)";
         ProcessRunner graalJava;
         try {

diff --git a/src/main/java/com/gluonhq/substrate/target/AbstractTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/AbstractTargetConfiguration.java
@@ -38,6 +38,7 @@
 import com.gluonhq.substrate.util.Logger;
 import com.gluonhq.substrate.util.ProcessRunner;
 import com.gluonhq.substrate.util.Strings;
+import com.gluonhq.substrate.util.Version;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -359,6 +360,13 @@ private String getJniPlatformArg() {
 
     private String getJniPlatform() {
         Triplet target = projectConfiguration.getTargetTriplet();
+        boolean graalVM221 = false;
+        try {
+            Version graalVersion = projectConfiguration.getGraalVersion();
+            graalVM221 = ((graalVersion.getMajor() > 21) && (graalVersion.getMinor() >0));
+        } catch (IOException ex) {
+            Logger.logFatal(ex, "Could not detect GraalVM version, stopping now.");
+        }
         String os = target.getOs();
         String arch = target.getArch();
         switch (os) {
@@ -380,7 +388,7 @@ private String getJniPlatform() {
                 }
                 return "IOS_AARCH64";
             case Constants.OS_DARWIN:
-                return "DARWIN_AMD64";
+                return graalVM221 ? "MACOS_AMD64" : "DARWIN_AMD64";
             case Constants.OS_WINDOWS:
                 return "WINDOWS_AMD64";
             case Constants.OS_ANDROID: