diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-01 23:36:26 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-02 00:12:41 +0900 |
| commit | bb5bbfe16ad3fa72f5eb9002e125dc9ec3e4b816 (patch) | |
| tree | 3bae9f45b30749f8f20b59c148be6f6604c58c75 /internal | |
| parent | 427e1ca37c9bbca50b2be813bc1ca61c2730b21a (diff) | |
internal/rosa/go: disable tsan test
The newly enabled tsan does not play well with go126, so disable for now.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/rosa/go.go | 16 | ||||
| -rw-r--r-- | internal/rosa/tamago.go | 8 |
2 files changed, 16 insertions, 8 deletions
diff --git a/internal/rosa/go.go b/internal/rosa/go.go index c552a875..ed337207 100644 --- a/internal/rosa/go.go +++ b/internal/rosa/go.go @@ -10,9 +10,9 @@ import ( // newGoBootstrap returns the Go bootstrap toolchain. func (t Toolchain) newGoBootstrap() pkg.Artifact { const checksum = "8o9JL_ToiQKadCTb04nvBDkp8O1xiWOolAxVEqaTGodieNe4lOFEjlOxN3bwwe23" - return t.New("go1.4-bootstrap", 0, []pkg.Artifact{ - t.Load(Bash), - }, nil, []string{ + return t.New("go1.4-bootstrap", 0, t.AppendPresets(nil, + Bash, + ), nil, []string{ "CGO_ENABLED=0", }, ` mkdir -p /var/tmp/ /work/system/ @@ -35,9 +35,9 @@ func (t Toolchain) newGo( script string, extra ...pkg.Artifact, ) pkg.Artifact { - return t.New("go"+version, 0, slices.Concat([]pkg.Artifact{ - t.Load(Bash), - }, extra), nil, slices.Concat([]string{ + return t.New("go"+version, 0, t.AppendPresets(extra, + Bash, + ), nil, slices.Concat([]string{ "CC=cc", "GOCACHE=/tmp/gocache", "GOROOT_BOOTSTRAP=/system/go", @@ -156,7 +156,9 @@ sed -i \ internal/runtime/gc/scan/scan_amd64.go rm \ - os/root_unix_test.go + os/root_unix_test.go \ + cmd/cgo/internal/testsanitizers/tsan_test.go \ + cmd/cgo/internal/testsanitizers/cshared_test.go `, go125, ), version } diff --git a/internal/rosa/tamago.go b/internal/rosa/tamago.go index 594a91e0..538dc65e 100644 --- a/internal/rosa/tamago.go +++ b/internal/rosa/tamago.go @@ -27,8 +27,14 @@ chmod -R +w .. sed -i \ 's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \ cmd/link/internal/`+runtime.GOARCH+`/obj.go +sed -i \ + 's/cpu.X86.HasAVX512VBMI/& \&\& cpu.X86.HasPOPCNT/' \ + internal/runtime/gc/scan/scan_amd64.go + rm \ - os/root_unix_test.go + os/root_unix_test.go \ + cmd/cgo/internal/testsanitizers/tsan_test.go \ + cmd/cgo/internal/testsanitizers/cshared_test.go ./all.bash `, pkg.Path(AbsUsrSrc.Append("tamago"), false, newFromGitHub( |