aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/rosa/rosa.go
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2026-05-18 18:20:17 +0900
committerOphestra <cat@gensokyo.uk>2026-05-18 21:23:19 +0900
commit34822925e18cb35e1815d3837a8b55169953d876 (patch)
treeb623d2ff87dea4b2f9d5b2fc32a78ae135b8d11e /internal/rosa/rosa.go
parent37df040d85e06100c69c6aa3560b2e4ebf977255 (diff)
internal/rosa: migrate GNU software
These are quite trivial, so migrate them in one pass. Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/rosa.go')
-rw-r--r--internal/rosa/rosa.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go
index d1a6c25e..d9d0b9ef 100644
--- a/internal/rosa/rosa.go
+++ b/internal/rosa/rosa.go
@@ -388,7 +388,7 @@ type Helper interface {
// also empty. The special value helperInPlace omits the cd statement.
wantsDir() string
// script returns the helper-specific segment of cure script.
- script(s *S, name string) string
+ script(t Toolchain, name string) string
}
// PackageAttr holds build-system-agnostic attributes.
@@ -531,7 +531,7 @@ cd '/usr/src/` + name + `/'
extraRes,
attr.KnownChecksum,
attr.Env,
- scriptEarly+helper.script(t.S, name),
+ scriptEarly+helper.script(t, name),
slices.Concat(attr.Paths, []pkg.ExecPath{
pkg.Path(AbsUsrSrc.Append(
name+sourceSuffix,
@@ -545,11 +545,11 @@ cd '/usr/src/` + name + `/'
const (
// jobsE is expression for preferred job count set by [pkg].
jobsE = `"$` + pkg.EnvJobs + `"`
- // jobsE is expression for flag with preferred job count.
+ // jobsFlagE is expression for flag with preferred job count.
jobsFlagE = `"-j$` + pkg.EnvJobs + `"`
// jobsLE is expression for twice of preferred job count set by [pkg].
jobsLE = `"$(expr ` + jobsE + ` '*' 2)"`
- // jobsE is expression for flag with double of preferred job count.
+ // jobsLFlagE is expression for flag with double of preferred job count.
jobsLFlagE = `"-j$(expr ` + jobsE + ` '*' 2)"`
)
@@ -624,7 +624,7 @@ func init() {
panic(err)
}
if err = native.EvaluateFS(sub); err != nil {
- println(err)
+ println(err.Error())
os.Exit(1)
}
}