Jeff Kowalczyk
c3058e5d67
* Rebase gcc-go.patch for go1.21 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/go1.21?expand=0&rev=43
97 lines
4.1 KiB
Diff
97 lines
4.1 KiB
Diff
diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
|
|
index a528d7a..506e1a4 100644
|
|
--- a/src/cmd/dist/buildtool.go
|
|
+++ b/src/cmd/dist/buildtool.go
|
|
@@ -219,7 +219,7 @@ func bootstrapBuildTools() {
|
|
// Use the purego build tag to disable other assembly code,
|
|
// such as in cmd/internal/notsha256.
|
|
cmd := []string{
|
|
- pathf("%s/bin/go", goroot_bootstrap),
|
|
+ pathf("%s/bin/go-$gcc_go_version", goroot_bootstrap),
|
|
"install",
|
|
"-tags=math_big_pure_go compiler_bootstrap purego",
|
|
}
|
|
diff --git a/src/make.bash b/src/make.bash
|
|
index 755b3b0..7bcb787 100755
|
|
--- a/src/make.bash
|
|
+++ b/src/make.bash
|
|
@@ -168,26 +168,26 @@ nogoenv() {
|
|
|
|
export GOROOT="$(cd .. && pwd)"
|
|
IFS=$'\n'; for go_exe in $(type -ap go); do
|
|
- if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
|
|
+ if [ ! -x "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" ]; then
|
|
goroot=$(GOROOT= nogoenv "$go_exe" env GOROOT)
|
|
if [ "$goroot" != "$GOROOT" ]; then
|
|
if [ "$goroot_bootstrap_set" = "true" ]; then
|
|
- printf 'WARNING: %s does not exist, found %s from env\n' "$GOROOT_BOOTSTRAP/bin/go" "$go_exe" >&2
|
|
+ printf 'WARNING: %s does not exist, found %s from env\n' "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" "$go_exe" >&2
|
|
printf 'WARNING: set %s as GOROOT_BOOTSTRAP\n' "$goroot" >&2
|
|
fi
|
|
GOROOT_BOOTSTRAP="$goroot"
|
|
fi
|
|
fi
|
|
done; unset IFS
|
|
-if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
|
|
- echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2
|
|
+if [ ! -x "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" ]; then
|
|
+ echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version." >&2
|
|
echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go $bootgo." >&2
|
|
exit 1
|
|
fi
|
|
# Get the exact bootstrap toolchain version to help with debugging.
|
|
# We clear GOOS and GOARCH to avoid an ominous but harmless warning if
|
|
# the bootstrap doesn't support them.
|
|
-GOROOT_BOOTSTRAP_VERSION=$(nogoenv "$GOROOT_BOOTSTRAP/bin/go" version | sed 's/go version //')
|
|
+GOROOT_BOOTSTRAP_VERSION=$(nogoenv "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" version | sed 's/go version //')
|
|
echo "Building Go cmd/dist using $GOROOT_BOOTSTRAP. ($GOROOT_BOOTSTRAP_VERSION)"
|
|
if $verbose; then
|
|
echo cmd/dist
|
|
@@ -198,7 +198,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then
|
|
exit 1
|
|
fi
|
|
rm -f cmd/dist/dist
|
|
-GOROOT="$GOROOT_BOOTSTRAP" nogoenv "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
|
|
+GOROOT="$GOROOT_BOOTSTRAP" nogoenv "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" build -o cmd/dist/dist ./cmd/dist
|
|
|
|
# -e doesn't propagate out of eval, so check success by hand.
|
|
eval $(./cmd/dist/dist env -p || echo FAIL=true)
|
|
diff --git a/src/make.rc b/src/make.rc
|
|
index 834c1f1..73db573 100755
|
|
--- a/src/make.rc
|
|
+++ b/src/make.rc
|
|
@@ -62,7 +62,7 @@ if(! ~ $#GOROOT_BOOTSTRAP 1){
|
|
GOROOT_BOOTSTRAP = $home/$d
|
|
}
|
|
for(p in $path){
|
|
- if(! test -x $GOROOT_BOOTSTRAP/bin/go){
|
|
+ if(! test -x $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version){
|
|
if(go_exe = `{path=$p whatis go}){
|
|
goroot = `{GOROOT=() nogoenv $go_exe env GOROOT}
|
|
if(! ~ $goroot $GOROOT){
|
|
@@ -75,8 +75,8 @@ for(p in $path){
|
|
}
|
|
}
|
|
}
|
|
-if(! test -x $GOROOT_BOOTSTRAP/bin/go){
|
|
- echo 'ERROR: Cannot find '$GOROOT_BOOTSTRAP'/bin/go.' >[1=2]
|
|
+if(! test -x $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version){
|
|
+ echo 'ERROR: Cannot find '$GOROOT_BOOTSTRAP'/bin/go-$gcc_go_version.' >[1=2]
|
|
echo 'Set $GOROOT_BOOTSTRAP to a working Go tree >= Go '$bootgo'.' >[1=2]
|
|
exit bootstrap
|
|
}
|
|
@@ -89,11 +89,11 @@ if(~ $GOROOT_BOOTSTRAP $GOROOT){
|
|
# Get the exact bootstrap toolchain version to help with debugging.
|
|
# We clear GOOS and GOARCH to avoid an ominous but harmless warning if
|
|
# the bootstrap doesn't support them.
|
|
-GOROOT_BOOTSTRAP_VERSION=`{nogoenv $GOROOT_BOOTSTRAP/bin/go version | sed 's/go version //'}
|
|
+GOROOT_BOOTSTRAP_VERSION=`{nogoenv $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version version | sed 's/go version //'}
|
|
echo 'Building Go cmd/dist using '$GOROOT_BOOTSTRAP'. ('$"GOROOT_BOOTSTRAP_VERSION')'
|
|
if(~ $#vflag 1)
|
|
echo cmd/dist
|
|
-GOROOT=$GOROOT_BOOTSTRAP nogoenv $GOROOT_BOOTSTRAP/bin/go build -o cmd/dist/dist ./cmd/dist
|
|
+GOROOT=$GOROOT_BOOTSTRAP nogoenv $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version build -o cmd/dist/dist ./cmd/dist
|
|
|
|
eval `{./cmd/dist/dist env -9}
|
|
if(~ $#vflag 1)
|