mirror of https://github.com/sbt/sbt.git
Revert "Merge pull request #7823 from Friendseeker/musl"
This reverts commit0c00dbaf4b, reversing changes made to91ea2feb64.
This commit is contained in:
parent
94f239f4ae
commit
801137de31
|
|
@ -80,13 +80,6 @@ jobs:
|
|||
repository: sbt/zinc
|
||||
ref: 1.10.x
|
||||
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
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
|
|
|
|||
11
build.sbt
11
build.sbt
|
|
@ -1176,13 +1176,8 @@ lazy val sbtClientProj = (project in file("client"))
|
|||
nativeImageReady := { () =>
|
||||
()
|
||||
},
|
||||
if (isArmArchitecture)
|
||||
Seq(
|
||||
nativeImageVersion := "23.0",
|
||||
nativeImageJvm := "graalvm-java23",
|
||||
)
|
||||
else Nil,
|
||||
nativeImageInstalled := !isArmArchitecture,
|
||||
nativeImageVersion := "23.0",
|
||||
nativeImageJvm := "graalvm-java23",
|
||||
nativeImageOutput := {
|
||||
val outputDir = (target.value / "bin").toPath
|
||||
if (!Files.exists(outputDir)) {
|
||||
|
|
@ -1204,7 +1199,7 @@ lazy val sbtClientProj = (project in file("client"))
|
|||
s"-H:Name=${target.value / "bin" / "sbtn"}",
|
||||
) ++ (if (isLinux && isArmArchitecture)
|
||||
Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
|
||||
else Nil) ++ (if (isLinux && !isArmArchitecture) Seq("--static", "--libc=musl") else Nil),
|
||||
else Nil),
|
||||
buildThinClient := {
|
||||
val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish")
|
||||
val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh"
|
||||
|
|
|
|||
Loading…
Reference in New Issue