1 files changed, 23 insertions, 20 deletions
diff --git a/internal/rosa/openssl.go b/internal/rosa/openssl.go
index 783a2f0c..c218e8a5 100644
--- a/internal/rosa/openssl.go
+++ b/internal/rosa/openssl.go
@@ -7,30 +7,33 @@ func (t Toolchain) newOpenSSL() pkg.Artifact {
 		version  = "3.5.5"
 		checksum = "I2Hp1LxcTR8j4G6LFEQMVy6EJH-Na1byI9Ti-ThBot6EMLNRnjGXGq-WXrim3Fkz"
 	)
-	return t.New("openssl-"+version, 0, []pkg.Artifact{
-		t.Load(Perl),
-		t.Load(Make),
+	return t.NewViaMake("openssl", version, pkg.NewHTTPGetTar(
+		nil, "https://github.com/openssl/openssl/releases/download/"+
+			"openssl-"+version+"/openssl-"+version+".tar.gz",
+		mustDecode(checksum),
+		pkg.TarGzip,
+	), &MakeAttr{
+		OmitDefaults:  true,
+		SkipConfigure: true,
 
-		t.Load(Zlib),
-		t.Load(KernelHeaders),
-	}, nil, []string{
-		"CC=cc",
-	}, `
-cd "$(mktemp -d)"
+		Env: []string{
+			"CC=cc",
+		},
+		ScriptConfigured: `
 /usr/src/openssl/Configure \
 	--prefix=/system \
 	--libdir=lib \
 	--openssldir=etc/ssl
-make \
-	"-j$(nproc)" \
-	HARNESS_JOBS=256 \
-	test
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("openssl"), false, pkg.NewHTTPGetTar(
-		nil, "https://github.com/openssl/openssl/releases/download/"+
-			"openssl-"+version+"/openssl-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
-	)))
+`,
+		CheckName: "test",
+		Make: []string{
+			"HARNESS_JOBS=256",
+		},
+	},
+		t.Load(Perl),
+
+		t.Load(Zlib),
+		t.Load(KernelHeaders),
+	)
 }
 func init() { artifactsF[OpenSSL] = Toolchain.newOpenSSL }