tool/gocross: support local toolchain for development

This makes gocross and its bootstrap script understand an absolute
path in go.toolchain.rev to mean "use the given toolchain directly".

Signed-off-by: David Anderson <danderson@tailscale.com>

2 files changed, 34 insertions, 18 deletions

diff --git a/tool/gocross/gocross-wrapper.sh b/tool/gocross/gocross-wrapper.sh
index 6dd353ae7..b2e6cd310 100755
--- a/tool/gocross/gocross-wrapper.sh
+++ b/tool/gocross/gocross-wrapper.sh
@@ -31,23 +31,30 @@ if [ ! -d "$toolchain" ]; then
     # updates.
     read -r REV <$repo_root/go.toolchain.rev
 
-    # This works for linux and darwin, which is sufficient
-    # (we do not build tailscale-go for other targets).
-    HOST_OS=$(uname -s | tr A-Z a-z)
-    HOST_ARCH="$(uname -m)"
-    if [ "$HOST_ARCH" = "aarch64" ]; then
-        # Go uses the name "arm64".
-        HOST_ARCH="arm64"
-    elif [ "$HOST_ARCH" = "x86_64" ]; then
-        # Go uses the name "amd64".
-        HOST_ARCH="amd64"
-    fi
+    case "$REV" in
+    /*)
+        toolchain="$REV"
+        ;;
+    *)
+        # This works for linux and darwin, which is sufficient
+        # (we do not build tailscale-go for other targets).
+        HOST_OS=$(uname -s | tr A-Z a-z)
+        HOST_ARCH="$(uname -m)"
+        if [ "$HOST_ARCH" = "aarch64" ]; then
+            # Go uses the name "arm64".
+            HOST_ARCH="arm64"
+        elif [ "$HOST_ARCH" = "x86_64" ]; then
+            # Go uses the name "amd64".
+            HOST_ARCH="amd64"
+        fi
 
-    rm -rf "$toolchain" "$toolchain.extracted"
-    curl -f -L -o "$toolchain.tar.gz" "https://github.com/tailscale/go/releases/download/build-${REV}/${HOST_OS}-${HOST_ARCH}.tar.gz"
-    mkdir -p "$toolchain"
-    (cd "$toolchain" && tar --strip-components=1 -xf "$toolchain.tar.gz")
-    echo "$REV" >"$toolchain.extracted"
+        rm -rf "$toolchain" "$toolchain.extracted"
+        curl -f -L -o "$toolchain.tar.gz" "https://github.com/tailscale/go/releases/download/build-${REV}/${HOST_OS}-${HOST_ARCH}.tar.gz"
+        mkdir -p "$toolchain"
+        (cd "$toolchain" && tar --strip-components=1 -xf "$toolchain.tar.gz")
+        echo "$REV" >"$toolchain.extracted"
+        ;;
+    esac
 fi
 
 # Binaries run with `gocross run` can reinvoke gocross, resulting in a
diff --git a/tool/gocross/toolchain.go b/tool/gocross/toolchain.go
index 67ea7c5c5..38935ebfc 100644
--- a/tool/gocross/toolchain.go
+++ b/tool/gocross/toolchain.go
@@ -112,9 +112,18 @@ func ensureToolchain(cacheDir, toolchainDir string) error {
 		return err
 	}
 
-	if err := downloadCachedgo(toolchainDir, wantRev); err != nil {
-		return err
+	if filepath.IsAbs(wantRev) {
+		// Local dev toolchain.
+		if err := os.Symlink(wantRev, toolchainDir); err != nil {
+			return err
+		}
+		return nil
+	} else {
+		if err := downloadCachedgo(toolchainDir, wantRev); err != nil {
+			return err
+		}
 	}
+
 	if err := os.WriteFile(stampFile, []byte(wantRev), 0644); err != nil {
 		return err
 	}