diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-10-29 00:02:52 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-10-29 00:02:52 +0900 |
| commit | 5405c0551e2b42179db7fc0374c69f094859e5e3 (patch) | |
| tree | cc9dc1d04eb1fe3b50d17610bafd16ca60e7b9a9 /internal/rosa/package | |
| parent | d011c3309fe803e08e7a050b837876d947b7a7b2 (diff) | |
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>
Diffstat (limited to 'internal/rosa/package')
| -rw-r--r-- | internal/rosa/package/go.az | 15 | ||||
| -rw-r--r-- | internal/rosa/package/tamago.az | 14 |
2 files changed, 14 insertions, 15 deletions
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"; }; |