diff options
Diffstat (limited to 'internal/rosa/go.go')
| -rw-r--r-- | internal/rosa/go.go | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/internal/rosa/go.go b/internal/rosa/go.go index dac77aa7..71d552e2 100644 --- a/internal/rosa/go.go +++ b/internal/rosa/go.go @@ -22,7 +22,7 @@ func (t Toolchain) newGo( Env: slices.Concat([]string{ "CC=cc", "GOCACHE=/tmp/gocache", - "GOROOT_BOOTSTRAP=/system/go", + "GOROOT_BOOTSTRAP=" + Prefix + "/go", "TMPDIR=/dev/shm/go", }, env), @@ -30,9 +30,9 @@ func (t Toolchain) newGo( }, &GenericHelper{ InPlace: true, Build: ` -mkdir /work/system/ "${TMPDIR}" -cp -r . /work/system/go -cd /work/system/go/src/ +mkdir /work` + Prefix + `/ "${TMPDIR}" +cp -r . /work` + Prefix + `/go +cd /work` + Prefix + `/go/src/ chmod -R +w .. ` + script + ` set +u @@ -42,11 +42,11 @@ set -u Install: ` ../bin/go tool dist banner # print build info -mkdir /work/system/bin +mkdir /work` + Prefix + `/bin ln -s \ ../go/bin/go \ ../go/bin/gofmt \ - /work/system/bin + /work` + Prefix + `/bin `, }, _bash, @@ -91,9 +91,9 @@ func init() { }, &GenericHelper{ InPlace: true, Build: ` -mkdir /work/system/ -cp -r . /work/system/go -cd /work/system/go/src/ +mkdir /work` + Prefix + `/ +cp -r . /work` + Prefix + `/go +cd /work` + Prefix + `/go/src/ mkdir -p /var/tmp/ ./make.bash `, @@ -102,7 +102,7 @@ mkdir -p /var/tmp/ )} case "arm64", "riscv64": - bootstrapEnv = append(bootstrapEnv, "GOROOT_BOOTSTRAP=/system") + bootstrapEnv = append(bootstrapEnv, "GOROOT_BOOTSTRAP="+Prefix) bootstrapEarly = t.Append(bootstrapEarly, H("gcc")) finalEnv = append(finalEnv, "CGO_ENABLED=0") @@ -131,7 +131,7 @@ echo \ "YtrDka402BOAEwywx03Vz4QlVwoBiguJHzG7PuythMCPHXS8CVMLvzmvgEbu4Tzu", []string{"CGO_ENABLED=0"}, ` sed -i \ - 's,/lib/ld-musl-`+t.llvmArch()+`.so.1,/system/bin/linker,' \ + 's,/lib/ld-musl-`+t.llvmArch()+`.so.1,`+Prefix+`/bin/linker,' \ cmd/link/internal/`+t.arch+`/obj.go rm \ @@ -149,7 +149,7 @@ echo \ "wcI32bl1tkqbgcelGtGWPI4RtlEddd-PTd76Eb-k7nXA5LbE9yTNdIL9QSOOxMOs", []string{"CGO_ENABLED=0"}, ` sed -i \ - 's,/lib/ld-musl-`+t.llvmArch()+`.so.1,/system/bin/linker,' \ + 's,/lib/ld-musl-`+t.llvmArch()+`.so.1,`+Prefix+`/bin/linker,' \ cmd/link/internal/`+t.arch+`/obj.go `, go121, ) @@ -159,7 +159,7 @@ sed -i \ checksum, []string{"CGO_ENABLED=0"}, ` sed -i \ - 's,/lib/ld-musl-`+t.llvmArch()+`.so.1,/system/bin/linker,' \ + 's,/lib/ld-musl-`+t.llvmArch()+`.so.1,`+Prefix+`/bin/linker,' \ cmd/link/internal/`+t.arch+`/obj.go rm \ |