From 5405c0551e2b42179db7fc0374c69f094859e5e3 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Thu, 29 Oct 2026 00:02:52 +0900
Subject: internal/rosa/go: remove superfluous patching

These patches are for tests only, which are no longer run for the
bootstrap stages. This change also removes dynamic linker path override
for the final stage, and works around the test by making musl available
at the expected path in the container.

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 internal/rosa/go.go             | 48 ++++++-----------------------------------
 internal/rosa/package/go.az     | 15 ++++++-------
 internal/rosa/package/tamago.az | 14 ++++++------
 3 files changed, 21 insertions(+), 56 deletions(-)

(limited to 'internal')

diff --git a/internal/rosa/go.go b/internal/rosa/go.go
index 71d552e2..866ee094 100644
--- a/internal/rosa/go.go
+++ b/internal/rosa/go.go
@@ -77,7 +77,8 @@ func init() {
 			finalEnv []string
 		)
 
-		switch arch := t.Arch(); arch {
+		arch := t.Arch()
+		switch arch {
 		case "amd64":
 			bootstrapEarly = []pkg.Artifact{t.New("go", "1.4-bootstrap", newTar(
 				"https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz",
@@ -107,65 +108,30 @@ mkdir -p /var/tmp/
 			finalEnv = append(finalEnv, "CGO_ENABLED=0")
 
 		default:
-			panic("unsupported target " + t.arch)
+			panic("unsupported target " + arch)
 		}
 
 		go119 := t.newGo(
 			"1.19.13",
 			"MpXfAzOlxdEW_XHmss2IpErg7rJiBsAD9WGgjNo26FXsIyc2gShcz0UJawhEj0IT",
-			append(bootstrapEnv, "CGO_ENABLED=0"), `
-rm \
-	crypto/tls/handshake_client_test.go \
-	cmd/pprof/pprof_test.go \
-	os/os_unix_test.go
-sed -i \
-	's/os\.Getenv("GCCGO")$/"nonexistent"/' \
-	go/internal/gccgoimporter/importer_test.go
-echo \
-	'type syscallDescriptor = int' >> \
-	os/rawconn_test.go
-`, bootstrapEarly...)
+			append(bootstrapEnv, "CGO_ENABLED=0"), "", bootstrapEarly...)
 
 		go121 := t.newGo(
 			"1.21.13",
 			"YtrDka402BOAEwywx03Vz4QlVwoBiguJHzG7PuythMCPHXS8CVMLvzmvgEbu4Tzu",
-			[]string{"CGO_ENABLED=0"}, `
-sed -i \
-	's,/lib/ld-musl-`+t.llvmArch()+`.so.1,`+Prefix+`/bin/linker,' \
-	cmd/link/internal/`+t.arch+`/obj.go
-
-rm \
-	crypto/tls/handshake_client_test.go \
-	crypto/tls/handshake_server_test.go \
-	os/os_unix_test.go
-echo \
-	'type syscallDescriptor = int' >> \
-	os/rawconn_test.go
-`, go119,
+			[]string{"CGO_ENABLED=0"}, "", go119,
 		)
 
 		go123 := t.newGo(
 			"1.23.12",
 			"wcI32bl1tkqbgcelGtGWPI4RtlEddd-PTd76Eb-k7nXA5LbE9yTNdIL9QSOOxMOs",
-			[]string{"CGO_ENABLED=0"}, `
-sed -i \
-	's,/lib/ld-musl-`+t.llvmArch()+`.so.1,`+Prefix+`/bin/linker,' \
-	cmd/link/internal/`+t.arch+`/obj.go
-`, go121,
+			[]string{"CGO_ENABLED=0"}, "", go121,
 		)
 
 		go125 := t.newGo(
 			version,
 			checksum,
-			[]string{"CGO_ENABLED=0"}, `
-sed -i \
-	's,/lib/ld-musl-`+t.llvmArch()+`.so.1,`+Prefix+`/bin/linker,' \
-	cmd/link/internal/`+t.arch+`/obj.go
-
-rm \
-	os/root_unix_test.go \
-	net/smtp/smtp_test.go
-`, go123,
+			[]string{"CGO_ENABLED=0"}, "", go123,
 		)
 
 		return &meta, go125
diff --git a/internal/rosa/package/go.az b/internal/rosa/package/go.az
index 4f284341..6ec5249b 100644
--- a/internal/rosa/package/go.az
+++ b/internal/rosa/package/go.az
@@ -27,21 +27,20 @@ cp -r . /work`+prefix+`/go
 cd /work`+prefix+`/go/src/
 chmod -R +w ..
 
-sed -i \
-	's,/lib/ld-musl-`+llvmArch+`.so.1,`+prefix+`/bin/linker,' \
-	cmd/link/internal/`+arch+`/obj.go
-
+set +u
+. ./make.bash "$@" --no-banner
+set -u
+`;
+		check = `
+mkdir /lib && ln -s ../system/lib/ld-musl-`+llvmArch+`.so.1 /lib/
 rm \
 	os/root_unix_test.go \
 	runtime/crash_cgo_test.go \
 	cmd/cgo/internal/testsanitizers/tsan_test.go \
 	cmd/cgo/internal/testsanitizers/cshared_test.go
 
-set +u
-. ./make.bash "$@" --no-banner
-set -u
+bash run.bash --no-rebuild
 `;
-		check = "bash run.bash --no-rebuild\n";
 		install = `
 ../bin/go tool dist banner # print build info
 
diff --git a/internal/rosa/package/tamago.az b/internal/rosa/package/tamago.az
index bb0e14e1..2c286f6a 100644
--- a/internal/rosa/package/tamago.az
+++ b/internal/rosa/package/tamago.az
@@ -26,20 +26,20 @@ cp -r . /work`+prefix+`/tamago
 cd /work`+prefix+`/tamago/src
 chmod -R +w ..
 
-sed -i \
-	's,/lib/ld-musl-`+llvmArch+`.so.1,`+prefix+`/bin/linker,' \
-	cmd/link/internal/` + arch + `/obj.go
+set +u
+. ./make.bash "$@" --no-banner
+set -u
+`;
+		check = `
+mkdir /lib && ln -s ../system/lib/ld-musl-`+llvmArch+`.so.1 /lib/
 
 rm \
 	os/root_unix_test.go \
 	cmd/cgo/internal/testsanitizers/tsan_test.go \
 	cmd/cgo/internal/testsanitizers/cshared_test.go
 
-set +u
-. ./make.bash "$@" --no-banner
-set -u
+bash run.bash --no-rebuild
 `;
-		check = "bash run.bash --no-rebuild\n";
 		install = "../bin/go tool dist banner # print build info";
 	};
 
-- 
cgit v1.3.1