diff options
Diffstat (limited to 'internal/rosa/go.go')
| -rw-r--r-- | internal/rosa/go.go | 16 |
1 files changed, 9 insertions, 7 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 } |