exclude linux/x86-64 for now (PIC/segfault issues)
This commit is contained in:
Jacob Heider 2024-06-17 23:46:43 -04:00
parent 36a4159594
commit 08b8bdbfed
No known key found for this signature in database
GPG key ID: 59D15ADC7DCD39BB

View file

@ -5,6 +5,10 @@ distributable:
versions: versions:
github: apple/pkl github: apple/pkl
platforms:
- darwin
- linux/aarch64 # can't resolve the segfault on x86-64 (PIC, almost certainly)
companions: companions:
openjdk.org: '*' openjdk.org: '*'
@ -21,10 +25,15 @@ build:
sed -i '/-H:Class=org.pkl.cli.Main/i\ sed -i '/-H:Class=org.pkl.cli.Main/i\
,"--static"\ ,"--static"\
,"--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang"\ ,"--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang"\
,"-H:CCompilerOption=-fPIC"\ ,"-H:CCompilerOption=-Wl,-L{{deps.zlib.net.prefix}}/lib"\
,"-H:CCompilerOption=-Wl,-pie,-L{{deps.zlib.net.prefix}}/lib"\
,"-H:-CheckToolchain"' \ ,"-H:-CheckToolchain"' \
pkl-cli.gradle.kts pkl-cli.gradle.kts
if test "{{hw.arch}}" = "x86-64"; then
sed -i '/-H:Class=org.pkl.cli.Main/i\
,"-H:CCompilerOption=-fPIC"\
,"-H:CCompilerOption=-Wl,-pie"' \
pkl-cli.gradle.kts
fi
fi fi
if: <0.26.0 if: <0.26.0
working-directory: pkl-cli working-directory: pkl-cli
@ -33,10 +42,15 @@ build:
sed -i '/-H:Class=org.pkl.cli.Main/i\ sed -i '/-H:Class=org.pkl.cli.Main/i\
add("--static")\ add("--static")\
add("--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang")\ add("--native-compiler-path={{deps.llvm.org.prefix}}/bin/clang")\
add("-H:CCompilerOption=-fPIC")\ add("-H:CCompilerOption=-Wl,-L{{deps.zlib.net.prefix}}/lib")\
add("-H:CCompilerOption=-Wl,-pie,-L{{deps.zlib.net.prefix}}/lib")\
add("-H:-CheckToolchain")' \ add("-H:-CheckToolchain")' \
pkl-cli.gradle.kts pkl-cli.gradle.kts
if test "{{hw.arch}}" = "x86-64"; then
sed -i '/-H:Class=org.pkl.cli.Main/i\
add("-H:CCompilerOption=-fPIC")\
add("-H:CCompilerOption=-Wl,-pie")' \
pkl-cli.gradle.kts
fi
fi fi
if: '>=0.26.0' if: '>=0.26.0'
working-directory: pkl-cli working-directory: pkl-cli