diff --git a/build/toolbase/gotoolchain/def.bzl b/build/toolbase/gotoolchain/def.bzl
index 1722cc4..5c421e6 100644
--- a/build/toolbase/gotoolchain/def.bzl
+++ b/build/toolbase/gotoolchain/def.bzl
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_context", "GoSource")
+load("@io_bazel_rules_go//go:def.bzl", "GoSource", "go_context")
 
 # This implements the toolchain_library rule, which is used to generate a
 # rules_go compatible go_library-style target which contains toolchain.go.in
@@ -17,8 +17,8 @@
         template = ctx.file._template,
         output = out,
         substitutions = {
-            'GOROOT': go.root,
-            'GOTOOL': go.go.path,
+            "GOROOT": go.root,
+            "GOTOOL": go.go.path,
         },
     )
 
@@ -37,28 +37,19 @@
     source = {
         key: getattr(source, key)
         for key in dir(source)
-        if key not in ['to_json', 'to_proto']
+        if key not in ["to_json", "to_proto"]
     }
-    source['runfiles'] = runfiles
+    source["runfiles"] = runfiles
     source = GoSource(**source)
-    archive = go.archive(go, source)
-
 
     return [
         library,
         source,
-        archive,
-        DefaultInfo(
-            files = depset([archive.data.file]),
-            runfiles = runfiles,
-        ),
         OutputGroupInfo(
-            cgo_exports = archive.cgo_exports,
-            compilation_outputs = [archive.data.file],
+            go_generated_srcs = depset([out]),
         ),
     ]
 
-
 toolchain_library = rule(
     implementation = _toolchain_library_impl,
     attrs = {