aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/rosa/zlib.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/rosa/zlib.go')
-rw-r--r--internal/rosa/zlib.go25
1 files changed, 11 insertions, 14 deletions
diff --git a/internal/rosa/zlib.go b/internal/rosa/zlib.go
index 55346ee8..6ebd5a3d 100644
--- a/internal/rosa/zlib.go
+++ b/internal/rosa/zlib.go
@@ -7,19 +7,16 @@ func (t Toolchain) newZlib() pkg.Artifact {
version = "1.3.1"
checksum = "E-eIpNzE8oJ5DsqH4UuA_0GDKuQF5csqI8ooDx2w7Vx-woJ2mb-YtSbEyIMN44mH"
)
- return t.New("zlib-"+version, 0, []pkg.Artifact{
- t.Load(Make),
- }, nil, nil, `
-cd "$(mktemp -d)"
-CC="clang -fPIC" /usr/src/zlib/configure \
- --prefix /system
-make "-j$(nproc)" test
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("zlib"), true,
- pkg.NewHTTPGetTar(
- nil, "https://zlib.net/zlib-"+version+".tar.gz",
- mustDecode(checksum),
- pkg.TarGzip,
- )))
+ return t.NewViaMake("zlib", version, pkg.NewHTTPGetTar(
+ nil, "https://zlib.net/zlib-"+version+".tar.gz",
+ mustDecode(checksum),
+ pkg.TarGzip,
+ ), &MakeAttr{
+ OmitDefaults: true,
+ Env: []string{
+ "CC=clang -fPIC",
+ },
+ Build: `""`,
+ })
}
func init() { artifactsF[Zlib] = Toolchain.newZlib }