internal/rosa: fix toolchain layer order
All checks were successful
Test / Create distribution (push) Successful in 49s
Test / Sandbox (push) Successful in 2m39s
Test / ShareFS (push) Successful in 3m55s
Test / Hpkg (push) Successful in 4m27s
Test / Sandbox (race detector) (push) Successful in 4m59s
Test / Hakurei (race detector) (push) Successful in 6m13s
Test / Hakurei (push) Successful in 2m39s
Test / Flake checks (push) Successful in 1m43s

This allows extras to override toolchain artifacts.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-01-22 03:37:46 +09:00
parent 094a62ba9d
commit dcb8a6ea06

View File

@@ -215,14 +215,14 @@ ln -vs ../usr/bin /work/bin
case toolchainIntermediate, Std: case toolchainIntermediate, Std:
boot := t - 1 boot := t - 1
musl, compilerRT, runtimes, clang := boot.NewLLVM() musl, compilerRT, runtimes, clang := boot.NewLLVM()
support = slices.Concat([]pkg.Artifact{ support = slices.Concat(extra, []pkg.Artifact{
cureEtc{newIANAEtc()}, cureEtc{newIANAEtc()},
musl, musl,
compilerRT, compilerRT,
runtimes, runtimes,
clang, clang,
boot.NewBusybox(), boot.NewBusybox(),
}, extra) })
env = fixupEnviron(env, []string{ env = fixupEnviron(env, []string{
EnvTriplet + "=" + triplet(), EnvTriplet + "=" + triplet(),
lcMessages, lcMessages,