4 files changed, 240 insertions, 10 deletions
diff --git a/repos/extra/go/.checksum b/repos/extra/go/.checksum
index 6953e1e4..47e056b8 100644
--- a/repos/extra/go/.checksum
+++ b/repos/extra/go/.checksum
@@ -1,2 +1,3 @@
 adb492460834855b01b1ebf5f0e7e704f07cf99e18dabd682391c56c8cce15ce  go1.24.0.linux-amd64.tar.gz
 361aeb0f8d831325c8479102646b9b5845cd723449fa7999b8cbcb12f5830b11  go1.24.0.src.tar.gz
+2ee0f2a99545169814e54c976ab74bc022f8815f0060e534a7010403dfb3e6c8  make.sh
diff --git a/repos/extra/go/.files b/repos/extra/go/.files
index 901224a8..6533ebd3 100644
--- a/repos/extra/go/.files
+++ b/repos/extra/go/.files
@@ -9009,6 +9009,7 @@ drwxr-xr-x root/root    usr/lib/go/src/log/syslog/
 -rwxr-xr-x root/root    usr/lib/go/src/make.bash
 -rw-r--r-- root/root    usr/lib/go/src/make.bat
 -rwxr-xr-x root/root    usr/lib/go/src/make.rc
+-rwxr-xr-x root/root    usr/lib/go/src/make.sh
 drwxr-xr-x root/root    usr/lib/go/src/maps/
 -rw-r--r-- root/root    usr/lib/go/src/maps/example_test.go
 -rw-r--r-- root/root    usr/lib/go/src/maps/iter.go
diff --git a/repos/extra/go/abuild b/repos/extra/go/abuild
index 68d8f2de..1f72f58d 100644
--- a/repos/extra/go/abuild
+++ b/repos/extra/go/abuild
@@ -1,8 +1,9 @@
 name=go
 version=1.24.0
-release=1
+release=2
 source="https://${name}lang.org/dl/${name}${version}.src.tar.gz
-	https://golang.org/dl/go${version}.linux-amd64.tar.gz::noextract"
+	https://golang.org/dl/go${version}.linux-amd64.tar.gz::noextract
+	make.sh"
 
 build() {
 	if [ ! "$(which go)" ]; then
@@ -14,15 +15,16 @@ build() {
 	fi
 	
 	export GOCACHE=$SRC/.go
-    export GOROOT_FINAL=/usr/lib/go
+	export GOROOT_FINAL=/usr/lib/go
 
-    cd src
-    ./make.bash
+	cd src
+	cp $SRC/make.sh .
+	./make.sh
 
-    install -d $PKG/usr/lib
-    mv $SRC/go $PKG/usr/lib/
+	install -d $PKG/usr/lib
+	mv $SRC/go $PKG/usr/lib/
 
-    install -d $PKG/usr/bin
-    ln -s /usr/lib/go/bin/go $PKG/usr/bin/
-    ln -s /usr/lib/go/bin/gofmt $PKG/usr/bin/
+	install -d $PKG/usr/bin
+	ln -s /usr/lib/go/bin/go $PKG/usr/bin/
+	ln -s /usr/lib/go/bin/gofmt $PKG/usr/bin/
 }
diff --git a/repos/extra/go/make.sh b/repos/extra/go/make.sh
new file mode 100755
index 00000000..4f64d26b
--- /dev/null
+++ b/repos/extra/go/make.sh
@@ -0,0 +1,226 @@
+#!/bin/sh 
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# See golang.org/s/go15bootstrap for an overview of the build process.
+
+# Environment variables that control make.sh:
+#
+# GOHOSTARCH: The architecture for host tools (compilers and
+# binaries).  Binaries of this type must be executable on the current
+# system, so the only common reason to set this is to set
+# GOHOSTARCH=386 on an amd64 machine.
+#
+# GOARCH: The target architecture for installed packages and tools.
+#
+# GOOS: The target operating system for installed packages and tools.
+#
+# GO_GCFLAGS: Additional go tool compile arguments to use when
+# building the packages and commands.
+#
+# GO_LDFLAGS: Additional go tool link arguments to use when
+# building the commands.
+#
+# CGO_ENABLED: Controls cgo usage during the build. Set it to 1
+# to include all cgo related files, .c and .go file with "cgo"
+# build directive, in the build. Set it to 0 to ignore them.
+#
+# GO_EXTLINK_ENABLED: Set to 1 to invoke the host linker when building
+# packages that use cgo.  Set to 0 to do all linking internally.  This
+# controls the default behavior of the linker's -linkmode option.  The
+# default value depends on the system.
+#
+# GO_LDSO: Sets the default dynamic linker/loader (ld.so) to be used
+# by the internal linker.
+#
+# CC: Command line to run to compile C code for GOHOSTARCH.
+# Default is "gcc". Also supported: "clang".
+#
+# CC_FOR_TARGET: Command line to run to compile C code for GOARCH.
+# This is used by cgo. Default is CC.
+#
+# CC_FOR_${GOOS}_${GOARCH}: Command line to run to compile C code for specified ${GOOS} and ${GOARCH}.
+# (for example, CC_FOR_linux_arm)
+# If this is not set, the build will use CC_FOR_TARGET if appropriate, or CC.
+#
+# CXX_FOR_TARGET: Command line to run to compile C++ code for GOARCH.
+# This is used by cgo. Default is CXX, or, if that is not set,
+# "g++" or "clang++".
+#
+# CXX_FOR_${GOOS}_${GOARCH}: Command line to run to compile C++ code for specified ${GOOS} and ${GOARCH}.
+# (for example, CXX_FOR_linux_arm)
+# If this is not set, the build will use CXX_FOR_TARGET if appropriate, or CXX.
+#
+# FC: Command line to run to compile Fortran code for GOARCH.
+# This is used by cgo. Default is "gfortran".
+#
+# PKG_CONFIG: Path to pkg-config tool. Default is "pkg-config".
+#
+# GO_DISTFLAGS: extra flags to provide to "dist bootstrap".
+# (Or just pass them to the make.sh command line.)
+#
+# GOBUILDTIMELOGFILE: If set, make.sh and all.bash write
+# timing information to this file. Useful for profiling where the
+# time goes when these scripts run.
+#
+# GOROOT_BOOTSTRAP: A working Go tree >= Go 1.22.6 for bootstrap.
+# If $GOROOT_BOOTSTRAP/bin/go is missing, $(go env GOROOT) is
+# tried for all "go" in $PATH. By default, one of $HOME/go1.22.6,
+# $HOME/sdk/go1.22.6, or $HOME/go1.4, whichever exists, in that order.
+# We still check $HOME/go1.4 to allow for build scripts that still hard-code
+# that name even though they put newer Go toolchains there.
+
+bootgo=1.22.6
+
+set -e
+
+if [ ! -f run.bash ]; then
+	echo 'make.sh must be run from $GOROOT/src' 1>&2
+	exit 1
+fi
+
+if [ "$GOBUILDTIMELOGFILE" != "" ]; then
+	echo $(LC_TIME=C date) start make.sh >"$GOBUILDTIMELOGFILE"
+fi
+
+# Test for Windows.
+case "$(uname)" in
+*MINGW* | *WIN32* | *CYGWIN*)
+	echo 'ERROR: Do not use make.sh to build on Windows.'
+	echo 'Use make.bat instead.'
+	echo
+	exit 1
+	;;
+esac
+
+# Test for bad ld.
+if ld --version 2>&1 | grep 'gold.* 2\.20' >/dev/null; then
+	echo 'ERROR: Your system has gold 2.20 installed.'
+	echo 'This version is shipped by Ubuntu even though'
+	echo 'it is known not to work on Ubuntu.'
+	echo 'Binaries built with this linker are likely to fail in mysterious ways.'
+	echo
+	echo 'Run sudo apt-get remove binutils-gold.'
+	echo
+	exit 1
+fi
+
+# Test for bad SELinux.
+# On Fedora 16 the selinux filesystem is mounted at /sys/fs/selinux,
+# so loop through the possible selinux mount points.
+for se_mount in /selinux /sys/fs/selinux
+do
+	if [ -d $se_mount ] && [ -f $se_mount/booleans/allow_execstack ] && [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+		if ! cat $se_mount/booleans/allow_execstack | grep -c '^1 1$' >> /dev/null ; then
+			echo "WARNING: the default SELinux policy on, at least, Fedora 12 breaks "
+			echo "Go. You can enable the features that Go needs via the following "
+			echo "command (as root):"
+			echo "  # setsebool -P allow_execstack 1"
+			echo
+			echo "Note that this affects your system globally! "
+			echo
+			echo "The build will continue in five seconds in case we "
+			echo "misdiagnosed the issue..."
+
+			sleep 5
+		fi
+	fi
+done
+
+# Clean old generated file that will cause problems in the build.
+rm -f ./runtime/runtime_defs.go
+
+# Finally!  Run the build.
+
+verbose=false
+vflag=""
+if [ "$1" = "-v" ]; then
+	verbose=true
+	vflag=-v
+	shift
+fi
+
+goroot_bootstrap_set=${GOROOT_BOOTSTRAP+"true"}
+if [ -z "$GOROOT_BOOTSTRAP" ]; then
+	GOROOT_BOOTSTRAP="$HOME/go1.4"
+	for d in sdk/go$bootgo go$bootgo; do
+		if [ -d "$HOME/$d" ]; then
+			GOROOT_BOOTSTRAP="$HOME/$d"
+		fi
+	done
+fi
+export GOROOT_BOOTSTRAP
+
+bootstrapenv() {
+	GOROOT="$GOROOT_BOOTSTRAP" GO111MODULE=off GOENV=off GOOS= GOARCH= GOEXPERIMENT= GOFLAGS= "$@"
+}
+
+export GOROOT="$(cd .. && pwd)"
+IFS=$'\n'; for go_exe in $(command -v go); do
+	if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
+		goroot_bootstrap=$GOROOT_BOOTSTRAP
+		GOROOT_BOOTSTRAP=""
+		goroot=$(bootstrapenv "$go_exe" env GOROOT)
+		GOROOT_BOOTSTRAP=$goroot_bootstrap
+		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: 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
+	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=$(bootstrapenv "$GOROOT_BOOTSTRAP/bin/go" version | sed 's/go version //')
+echo "Building Go cmd/dist using $GOROOT_BOOTSTRAP. ($GOROOT_BOOTSTRAP_VERSION)"
+if $verbose; then
+	echo cmd/dist
+fi
+if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then
+	echo "ERROR: \$GOROOT_BOOTSTRAP must not be set to \$GOROOT" >&2
+	echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go $bootgo." >&2
+	exit 1
+fi
+rm -f cmd/dist/dist
+bootstrapenv "$GOROOT_BOOTSTRAP/bin/go" 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)
+if [ "$FAIL" = true ]; then
+	exit 1
+fi
+
+if $verbose; then
+	echo
+fi
+
+if [ "$1" = "--dist-tool" ]; then
+	# Stop after building dist tool.
+	mkdir -p "$GOTOOLDIR"
+	if [ "$2" != "" ]; then
+		cp cmd/dist/dist "$2"
+	fi
+	mv cmd/dist/dist "$GOTOOLDIR"/dist
+	exit 0
+fi
+
+# Run dist bootstrap to complete make.sh.
+# Bootstrap installs a proper cmd/dist, built with the new toolchain.
+# Throw ours, built with the bootstrap toolchain, away after bootstrap.
+./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@"
+rm -f ./cmd/dist/dist
+
+# DO NOT ADD ANY NEW CODE HERE.
+# The bootstrap+rm above are the final step of make.sh.
+# If something must be added, add it to cmd/dist's cmdbootstrap,
+# to avoid needing three copies in three different shell languages
+# (make.sh, make.bat, make.rc).