diff options
Diffstat (limited to 'internal/rosa/go.go')
| -rw-r--r-- | internal/rosa/go.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/internal/rosa/go.go b/internal/rosa/go.go index ed337207..f955c3aa 100644 --- a/internal/rosa/go.go +++ b/internal/rosa/go.go @@ -1,7 +1,6 @@ package rosa import ( - "runtime" "slices" "hakurei.app/internal/pkg" @@ -69,7 +68,7 @@ func (t Toolchain) newGoLatest() (pkg.Artifact, string) { finalEnv []string ) - switch runtime.GOARCH { + switch arch { case "amd64": bootstrapExtra = append(bootstrapExtra, t.newGoBootstrap()) @@ -79,7 +78,7 @@ func (t Toolchain) newGoLatest() (pkg.Artifact, string) { finalEnv = append(finalEnv, "CGO_ENABLED=0") default: - panic("unsupported target " + runtime.GOARCH) + panic("unsupported target " + arch) } go119 := t.newGo( @@ -104,7 +103,7 @@ echo \ []string{"CGO_ENABLED=0"}, ` sed -i \ 's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \ - cmd/link/internal/`+runtime.GOARCH+`/obj.go + cmd/link/internal/`+arch+`/obj.go rm \ crypto/tls/handshake_client_test.go \ @@ -122,7 +121,7 @@ echo \ []string{"CGO_ENABLED=0"}, ` sed -i \ 's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \ - cmd/link/internal/`+runtime.GOARCH+`/obj.go + cmd/link/internal/`+arch+`/obj.go `, go121, ) @@ -132,7 +131,7 @@ sed -i \ []string{"CGO_ENABLED=0"}, ` sed -i \ 's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \ - cmd/link/internal/`+runtime.GOARCH+`/obj.go + cmd/link/internal/`+arch+`/obj.go rm \ os/root_unix_test.go \ @@ -150,7 +149,7 @@ rm \ finalEnv, ` sed -i \ 's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \ - cmd/link/internal/`+runtime.GOARCH+`/obj.go + cmd/link/internal/`+arch+`/obj.go sed -i \ 's/cpu.X86.HasAVX512VBMI/& \&\& cpu.X86.HasPOPCNT/' \ internal/runtime/gc/scan/scan_amd64.go |