Simplify toolchain setup

.github/workflows/puku.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build puku
-        run: ./pleasew build -p -v notice --profile release //package:release_files
+        run: ./pleasew build -p -v notice //package:release_files
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

knownimports/BUILD

@@ -1,10 +1,8 @@
-root = f"third_party/go/toolchain/pkg/{CONFIG.OS}_{CONFIG.ARCH}"
-
 genrule(
     name = "go_root_packages",
-    srcs = ["//third_party/go:toolchain"],
+    srcs = ["//third_party/go:std"],
     outs = ["go_root_packages"],
-    cmd = f'find {root} -name "*.a" | sed -e s=^{root}/== | sed -e s="\.a\$"== > $OUT',
+    cmd = 'find $SRCS -name "*.a" | sed -re s=^third_party/go/std/pkg/[^/]+_[^/]+/== | sed -e s="\.a\$"== > $OUT',
 )
 
 go_library(

knownimports/known_imports.go

@@ -32,8 +32,7 @@ func IsInGoRoot(i string) bool {
 	if strings.HasPrefix(i, "crypto/") {
 		return true
 	}
-	_, ok := goRootImports[i]
-	if ok {
+	if _, ok := goRootImports[i]; ok {
 		return true
 	}
 

package/BUILD

@@ -1,18 +1,12 @@
 subinclude("//:version")
 
-filegroup(
-    name = "architectures",
-    srcs = ["architectures.build_defs"],
-    visibility = ["PUBLIC"],
-)
-
-subinclude(":architectures")
-
-go_toolchain(
-    name = "release_toolchain",
-    architectures = architectures,
-    version = CONFIG.GO_VERSION,
-)
+architectures = [
+    "darwin_amd64",
+    "darwin_arm64",
+    "freebsd_amd64",
+    "linux_amd64",
+    "linux_arm64",
+]
 
 def cross_compile(version, arch):
     return build_rule(

third_party/go/BUILD

@@ -1,9 +1,9 @@
-subinclude("///go//build_defs:go", "//package:architectures")
+subinclude("///go//build_defs:go")
 
 go_toolchain(
     name = "toolchain",
-    architectures = architectures,
     version = CONFIG.GO_VERSION,
+    install_std = False,
 )
 
 go_stdlib(