mirror of https://github.com/sbt/sbt.git
Merge pull request #7823 from Friendseeker/musl
[1.x] Static link `musl` during x86 Linux Native Image build
This commit is contained in:
commit
0c00dbaf4b
|
|
@ -80,6 +80,13 @@ jobs:
|
||||||
repository: sbt/zinc
|
repository: sbt/zinc
|
||||||
ref: 1.10.x
|
ref: 1.10.x
|
||||||
path: zinc
|
path: zinc
|
||||||
|
- uses: graalvm/setup-graalvm@v1
|
||||||
|
if: ${{ matrix.jobtype >= 7 && matrix.jobtype <= 9 }}
|
||||||
|
with:
|
||||||
|
java-version: '23'
|
||||||
|
native-image-musl: 'true'
|
||||||
|
set-java-home: 'false'
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Setup JDK
|
- name: Setup JDK
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -1176,8 +1176,7 @@ lazy val sbtClientProj = (project in file("client"))
|
||||||
nativeImageReady := { () =>
|
nativeImageReady := { () =>
|
||||||
()
|
()
|
||||||
},
|
},
|
||||||
nativeImageVersion := "23.0",
|
nativeImageInstalled := true,
|
||||||
nativeImageJvm := "graalvm-java23",
|
|
||||||
nativeImageOutput := {
|
nativeImageOutput := {
|
||||||
val outputDir = (target.value / "bin").toPath
|
val outputDir = (target.value / "bin").toPath
|
||||||
if (!Files.exists(outputDir)) {
|
if (!Files.exists(outputDir)) {
|
||||||
|
|
@ -1199,7 +1198,7 @@ lazy val sbtClientProj = (project in file("client"))
|
||||||
s"-H:Name=${target.value / "bin" / "sbtn"}",
|
s"-H:Name=${target.value / "bin" / "sbtn"}",
|
||||||
) ++ (if (isLinux && isArmArchitecture)
|
) ++ (if (isLinux && isArmArchitecture)
|
||||||
Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
|
Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
|
||||||
else Nil),
|
else Nil) ++ (if (isLinux && !isArmArchitecture) Seq("--static", "--libc=musl") else Nil),
|
||||||
buildThinClient := {
|
buildThinClient := {
|
||||||
val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish")
|
val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish")
|
||||||
val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh"
|
val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue