From 34822925e18cb35e1815d3837a8b55169953d876 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 18 May 2026 18:20:17 +0900 Subject: internal/rosa: migrate GNU software These are quite trivial, so migrate them in one pass. Signed-off-by: Ophestra --- internal/rosa/make.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'internal/rosa/make.go') diff --git a/internal/rosa/make.go b/internal/rosa/make.go index 961f2d33..8f5295b0 100644 --- a/internal/rosa/make.go +++ b/internal/rosa/make.go @@ -70,6 +70,8 @@ type MakeHelper struct { Make []string // Whether to skip the check target. SkipCheck bool + // Whether to skip the check target during stage0. + SkipCheckEarly bool // Name of the check target, zero value is equivalent to "check". Check []string // Replaces the default install command. @@ -123,7 +125,7 @@ func (attr *MakeHelper) wantsDir() string { } // script generates the cure script. -func (attr *MakeHelper) script(s *S, name string) string { +func (attr *MakeHelper) script(t Toolchain, name string) string { if attr == nil { attr = new(MakeHelper) } @@ -194,7 +196,8 @@ make \ } scriptMake += "\n" - if !attr.SkipCheck && s.opts&OptSkipCheck == 0 { + if !attr.SkipCheck && t.opts&OptSkipCheck == 0 && + (!attr.SkipCheckEarly || !t.stage.isStage0()) { scriptMake += attr.ScriptCheckEarly + `make \ ` + jobsFlagE + ` \ ` -- cgit v1.3.1