diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-04-14 00:35:06 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-04-14 00:35:42 +0900 |
| commit | ac825640ab2d03d47101f36a81b9edab7204fced (patch) | |
| tree | eed62bc56c4dc05954a20a84116b426bf1c72a94 /internal/rosa/musl.go | |
| parent | a7f7ce17959ccf36201338faeecdbf85d404fe7d (diff) | |
internal/rosa/llvm: migrate musl
This removes the pointless special treatment given to musl.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/musl.go')
| -rw-r--r-- | internal/rosa/musl.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/internal/rosa/musl.go b/internal/rosa/musl.go index f6ad8bb6..226cf8ca 100644 --- a/internal/rosa/musl.go +++ b/internal/rosa/musl.go @@ -4,7 +4,6 @@ import "hakurei.app/internal/pkg" func (t Toolchain) newMusl( headers bool, - env []string, extra ...pkg.Artifact, ) (pkg.Artifact, string) { const ( @@ -47,7 +46,15 @@ rmdir -v /work/lib // expected to be writable in copies Chmod: true, - Env: env, + Env: stage0ExclConcat(t, []string{ + "CC=clang", + "LIBCC=/system/lib/clang/" + llvmVersionMajor + "/lib/" + + triplet() + "/libclang_rt.builtins.a", + "AR=ar", + "RANLIB=ranlib", + }, + "LDFLAGS="+earlyLDFLAGS(false), + ), }, &helper, Coreutils, ), version @@ -55,7 +62,7 @@ rmdir -v /work/lib func init() { artifactsM[Musl] = Metadata{ f: func(t Toolchain) (pkg.Artifact, string) { - return t.newMusl(false, nil) + return t.newMusl(false, t.Load(LLVMCompilerRT)) }, Name: "musl", |