From 6b09c73fa1270b9f0bfeeaa465ce75e7c74f509d Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Mon, 17 Jun 2024 23:25:18 -0400 Subject: [PATCH] fix(pkl) apparently spacing and lines matter. ugh. --- projects/pkl-lang.org/package.yml | 37 +++++++++++++++++++------------ 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/projects/pkl-lang.org/package.yml b/projects/pkl-lang.org/package.yml index 922c350a..3bacde67 100644 --- a/projects/pkl-lang.org/package.yml +++ b/projects/pkl-lang.org/package.yml @@ -16,22 +16,31 @@ build: llvm.org: '*' script: # graalvm fails to understand our compiler environment - - run: LINE_PREFIX="," + - run: | + if test "{{hw.platform}}" = "darwin"; then + sed -i '/-H:Class=org.pkl.cli.Main/i\ + ,"--static"\ + ,"--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang"\ + ,"-H:CCompilerOption=-fPIC"\ + ,"-H:CCompilerOption=-Wl,-pie,-L{{deps.zlib.net.prefix}}/lib"\ + ,"-H:-CheckToolchain"' \ + pkl-cli.gradle.kts + fi if: <0.26.0 - - run: | - LINE_PREFIX="add(" - LINE_SUFFIX=")" - if: '>=0.26.0' - - run: | - sed -i "/-H:Class=org.pkl.cli.Main/i\ - ${LINE_PREFIX}\"--static\"${LINE_SUFFIX}\ - ${LINE_PREFIX}\"--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang\"${LINE_SUFFIX}\ - ${LINE_PREFIX}\"-H:CCompilerOption=-fPIC\"${LINE_SUFFIX}\ - ${LINE_PREFIX}\"-H:CCompilerOption=-Wl,-pie,-L{{deps.zlib.net.prefix}}/lib\"${LINE_SUFFIX}\ - ${LINE_PREFIX}\"-H:-CheckToolchain\"${LINE_SUFFIX}" \ - pkl-cli.gradle.kts - if: linux working-directory: pkl-cli + - run: | + if test "{{hw.platform}}" = "darwin"; then + sed -i '/-H:Class=org.pkl.cli.Main/i\ + add("--static")\ + add("--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang")\ + add("-H:CCompilerOption=-fPIC")\ + add("-H:CCompilerOption=-Wl,-pie,-L{{deps.zlib.net.prefix}}/lib")\ + add("-H:-CheckToolchain")' \ + pkl-cli.gradle.kts + fi + if: '>=0.26.0' + working-directory: pkl-cli + - ./gradlew -DreleaseBuild=true :pkl-cli:javaExecutable :pkl-cli:${SYS_NAME%os}ExecutableA${ARCH_NAME#a} - run: | install -D jpkl {{prefix}}/bin/jpkl