diff options
Diffstat (limited to 'internal/rosa/musl.go')
| -rw-r--r-- | internal/rosa/musl.go | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/internal/rosa/musl.go b/internal/rosa/musl.go index 74603bf0..076fffcc 100644 --- a/internal/rosa/musl.go +++ b/internal/rosa/musl.go @@ -13,11 +13,9 @@ func (t Toolchain) newMusl( ) name := "musl" - attr := MakeAttr{ + helper := MakeHelper{ OmitDefaults: true, SkipCheck: true, - - Env: env, Script: ` mkdir -p /work/system/bin COMPAT_LINKER_NAME="ld-musl-` + linuxArch() + `.so.1" @@ -31,20 +29,28 @@ rmdir -v /work/lib if headers { name += "-headers" - attr.ScriptInstall = "make DESTDIR=/work install-headers" - attr.Script = "" + helper.Make = []string{ + "DESTDIR=/work", + "install-headers", + } + helper.Install = "# headers installed during make" + helper.Script = "" } - return t.NewViaMake(name, version, t.NewPatchedSource( + return t.NewPackage(name, version, pkg.NewHTTPGetTar( + nil, "https://musl.libc.org/releases/musl-"+version+".tar.gz", + mustDecode(checksum), + pkg.TarGzip, + ), &PackageAttr{ + NonStage0: extra, + // expected to be writable in copies - "musl", version, pkg.NewHTTPGetTar( - nil, "https://musl.libc.org/releases/musl-"+version+".tar.gz", - mustDecode(checksum), - pkg.TarGzip, - ), false, - ), &attr, stage0Concat(t, extra, - t.Load(Coreutils), - )...) + Chmod: true, + + Env: env, + }, &helper, + Coreutils, + ) } func init() { artifactsF[Musl] = func(t Toolchain) pkg.Artifact { |