diff options
| -rw-r--r-- | internal/rosa/llvm.go | 22 | ||||
| -rw-r--r-- | internal/rosa/state.go | 6 |
2 files changed, 13 insertions, 15 deletions
diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 4d3e4b21..8e5a1655 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -154,7 +154,7 @@ func init() { sysroot := AbsSystem.Append(arch) ct := t.native() if ct.Arch() != arch { - ct = t.NewCross(arch).New(t.stage) + ct = ct.NewCross(arch).New(t.stage) } paths = append(paths, pkg.Path( sysroot, true, ct.Append(nil, @@ -222,7 +222,7 @@ func init() { // unwind: fails on musl "eh_frame_fde_pc_range", } - switch t.arch { + switch t.Arch() { case "arm64": skipChecks = append(skipChecks, // LLVM: intermittently crashes @@ -263,6 +263,16 @@ func init() { ScriptEarly: ` rm -f /system/bin/clang++.cfg `, + + Tools: P{ + _pythonEarly, + _perl, + _diffutils, + _bash, + _awk, + _coreutils, + _findutils, + }, }, &CMakeHelper{ Append: []string{"llvm"}, @@ -286,14 +296,6 @@ EOF Test: "ninja " + jobsFlagE + " " + loadFlagE + " check-all", }, - _pythonEarly, - _perl, - _diffutils, - _bash, - _awk, - _coreutils, - _findutils, - _zlib, _zstd, early, diff --git a/internal/rosa/state.go b/internal/rosa/state.go index f60d323b..caaea3e9 100644 --- a/internal/rosa/state.go +++ b/internal/rosa/state.go @@ -1241,11 +1241,7 @@ func (ctx *evalContext) pf( if o.P, err = check.NewAbs(overlay); err != nil { o.P = AbsUsrSrc.Append("extra", overlay) } - extraA := ctx.t.Append(nil, extraH...) - o.A = make([]pkg.Artifact, len(extraA)) - for i, a := range extraA { - o.A[i] = a - } + o.A = ctx.t.Append(nil, extraH...) attr.Paths = append(attr.Paths, o) } |