From: AsamK <asamk@gmx.de>
Date: Fri, 21 Oct 2022 08:33:46 +0000 (+0200)
Subject: Disable graalvm toolchain detection if GRAALVM_HOME is set
X-Git-Tag: v0.11.5~39
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/ae221e0447e163f02ad5a198586ce998136a55e7?ds=sidebyside

Disable graalvm toolchain detection if GRAALVM_HOME is set
---

diff --git a/build.gradle.kts b/build.gradle.kts
index b88a6bf8..49ff1f46 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,6 +22,13 @@ graalvmNative {
         this["main"].run {
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
+            if (System.getenv("GRAALVM_HOME") == null) {
+                javaLauncher.set(javaToolchains.launcherFor {
+                    languageVersion.set(JavaLanguageVersion.of(17))
+                })
+            } else {
+                toolchainDetection.set(false)
+            }
         }
     }
 }