feat: support toolchains building zig from source

zig/config/BUILD.bazel

@@ -3,6 +3,7 @@ filegroup(
     name = "all_files",
     srcs = [
         ":BUILD.bazel",
+        "//zig/config/bootstrapped:all_files",
         "//zig/config/mode:all_files",
         "//zig/config/threaded:all_files",
         "//zig/config/use_standalone_translate_c:all_files",

zig/config/bootstrapped/BUILD.bazel

@@ -0,0 +1,20 @@
+config_setting(
+    name = "bootstrap_enabled",
+    flag_values = {
+        "//zig/settings:bootstrapped": "true",
+    },
+)
+
+config_setting(
+    name = "bootstrap_disabled",
+    flag_values = {
+        "//zig/settings:bootstrapped": "false",
+    },
+)
+
+# Execute `bazel run //util:update_filegroups` to update this target.
+filegroup(
+    name = "all_files",
+    srcs = [":BUILD.bazel"],
+    visibility = ["//zig/config:__pkg__"],
+)

zig/private/BUILD.bazel

@@ -102,8 +102,6 @@ bzl_library(
     visibility = ["//zig:__subpackages__"],
     deps = [
         "//zig/private/providers:zig_toolchain_info",
-        "@aspect_bazel_lib//lib:paths",
-        "@bazel_skylib//lib:paths",
     ],
 )
 

zig/private/common/translate_c.bzl

@@ -120,16 +120,16 @@ def _builtin_translate_c(*, ctx, zigtoolchaininfo, global_args, compilation_cont
             transitive = transitive_inputs,
         ),
         outputs = [zig_out],
-        arguments = [zigtoolchaininfo.zig_exe_path, "translate-c", global_args, args],
+        arguments = [zigtoolchaininfo.zig_exe.path, "translate-c", global_args, args],
         mnemonic = "ZigTranslateC",
         progress_message = "zig translate-c %{label}",
         execution_requirements = {tag: "" for tag in ctx.attr.tags},
         env = {
             "ZIG_GLOBAL_CACHE_DIR": zigtoolchaininfo.zig_cache,
-            "ZIG_LIB_DIR": zigtoolchaininfo.zig_lib_path,
+            "ZIG_LIB_DIR": zigtoolchaininfo.zig_lib.path,
             "ZIG_LOCAL_CACHE_DIR": zigtoolchaininfo.zig_cache,
         },
-        tools = zigtoolchaininfo.zig_files,
+        tools = [zigtoolchaininfo.zig_exe, zigtoolchaininfo.zig_lib],
         toolchain = "//zig:toolchain_type",
     )
 

zig/private/common/zig_build.bzl

@@ -466,11 +466,11 @@ def zig_build_impl(ctx, *, kind):
 
     zig_build_kwargs = dict(
         execution_requirements = {tag: "" for tag in ctx.attr.tags},
-        tools = zigtoolchaininfo.zig_files,
+        tools = [zigtoolchaininfo.zig_exe, zigtoolchaininfo.zig_lib],
         toolchain = "//zig:toolchain_type",
         env = {
             "ZIG_GLOBAL_CACHE_DIR": zigtoolchaininfo.zig_cache,
-            "ZIG_LIB_DIR": zigtoolchaininfo.zig_lib_path,
+            "ZIG_LIB_DIR": zigtoolchaininfo.zig_lib.path,
             "ZIG_LOCAL_CACHE_DIR": zigtoolchaininfo.zig_cache,
         },
     )
@@ -511,7 +511,7 @@ def zig_build_impl(ctx, *, kind):
             ctx.actions.run(
                 outputs = [static_lib] + auxiliary_outputs,
                 inputs = inputs,
-                executable = zigtoolchaininfo.zig_exe_path,
+                executable = zigtoolchaininfo.zig_exe,
                 arguments = ["build-lib", global_args, args],
                 mnemonic = "ZigBuildLib",
                 progress_message = "zig build-lib %{label}",
@@ -548,7 +548,7 @@ def zig_build_impl(ctx, *, kind):
             ctx.actions.run(
                 outputs = [bin_output] + auxiliary_outputs,
                 inputs = inputs,
-                executable = zigtoolchaininfo.zig_exe_path,
+                executable = zigtoolchaininfo.zig_exe,
                 arguments = ["build-exe", global_args, args],
                 mnemonic = "ZigBuildExe",
                 progress_message = "zig build-exe %{label}",
@@ -564,7 +564,7 @@ def zig_build_impl(ctx, *, kind):
                 ctx.actions.run(
                     outputs = [test_obj] + auxiliary_outputs,
                     inputs = inputs,
-                    executable = zigtoolchaininfo.zig_exe_path,
+                    executable = zigtoolchaininfo.zig_exe,
                     arguments = ["test-obj", "--test-no-exec", global_args, args, test_args],
                     mnemonic = "ZigBuildTest",
                     progress_message = "zig test-obj %{label}",
@@ -583,7 +583,7 @@ def zig_build_impl(ctx, *, kind):
                 ctx.actions.run(
                     outputs = [bc] + auxiliary_outputs,
                     inputs = inputs,
-                    executable = zigtoolchaininfo.zig_exe_path,
+                    executable = zigtoolchaininfo.zig_exe,
                     arguments = ["test", "--test-no-exec", global_args, args, test_args],
                     mnemonic = "ZigBuildTest",
                     progress_message = "zig test %{label}",
@@ -602,7 +602,7 @@ def zig_build_impl(ctx, *, kind):
             ctx.actions.run(
                 outputs = [static_lib],
                 inputs = [test_artifact],
-                executable = zigtoolchaininfo.zig_exe_path,
+                executable = zigtoolchaininfo.zig_exe,
                 arguments = ["build-lib", global_args, lib_args],
                 mnemonic = "ZigBuildLib",
                 progress_message = "zig build-lib %{label}",
@@ -639,7 +639,7 @@ def zig_build_impl(ctx, *, kind):
             ctx.actions.run(
                 outputs = [bin_output] + auxiliary_outputs,
                 inputs = inputs,
-                executable = zigtoolchaininfo.zig_exe_path,
+                executable = zigtoolchaininfo.zig_exe,
                 arguments = ["test", "--test-no-exec", global_args, args],
                 mnemonic = "ZigBuildTest",
                 progress_message = "zig test %{label}",
@@ -653,7 +653,7 @@ def zig_build_impl(ctx, *, kind):
         ctx.actions.run(
             outputs = ([bin_output] if ctx.attr.emit_bin else []) + auxiliary_outputs,
             inputs = inputs,
-            executable = zigtoolchaininfo.zig_exe_path,
+            executable = zigtoolchaininfo.zig_exe,
             arguments = ["build-lib", global_args, args],
             mnemonic = "ZigBuildStaticLib",
             progress_message = "zig build-lib %{label}",
@@ -677,7 +677,7 @@ def zig_build_impl(ctx, *, kind):
             ctx.actions.run(
                 outputs = [static_lib] + auxiliary_outputs,
                 inputs = inputs,
-                executable = zigtoolchaininfo.zig_exe_path,
+                executable = zigtoolchaininfo.zig_exe,
                 arguments = ["build-lib", global_args, args],
                 mnemonic = "ZigBuildLib",
                 progress_message = "zig build-lib %{label}",
@@ -729,7 +729,7 @@ def zig_build_impl(ctx, *, kind):
             ctx.actions.run(
                 outputs = [bin_output] + auxiliary_outputs,
                 inputs = inputs,
-                executable = zigtoolchaininfo.zig_exe_path,
+                executable = zigtoolchaininfo.zig_exe,
                 arguments = ["build-lib", "-dynamic", global_args, args],
                 mnemonic = "ZigBuildSharedLib",
                 progress_message = "zig build-lib -dynamic %{label}",

zig/private/common/zig_docs.bzl

@@ -187,8 +187,8 @@ def zig_docs_impl(ctx, *, kind):
     ctx.actions.run(
         outputs = outputs,
         inputs = inputs,
-        executable = zigtoolchaininfo.zig_exe_path,
-        tools = zigtoolchaininfo.zig_files,
+        executable = zigtoolchaininfo.zig_exe,
+        tools = [zigtoolchaininfo.zig_exe, zigtoolchaininfo.zig_lib],
         arguments = arguments,
         mnemonic = mnemonic,
         progress_message = progress_message,

zig/private/common/zig_lib_dir.bzl

@@ -10,4 +10,4 @@ def zig_lib_dir(*, zigtoolchaininfo, args):
       zigtoolchaininfo: ZigToolchainInfo.
       args: Args; mutable, Append the Zig cache flags to this object.
     """
-    args.add_all(["--zig-lib-dir", zigtoolchaininfo.zig_lib_path])
+    args.add_all(["--zig-lib-dir", zigtoolchaininfo.zig_lib])

zig/private/providers/zig_toolchain_info.bzl

@@ -5,23 +5,9 @@ Information about how to invoke the Zig executable.
 """
 
 FIELDS = {
-    "zig_exe_path": "Path to the Zig executable for the target platform.",
-    "zig_exe_rpath": """\
-Rlocation path to the Zig executable for the target platform.
-
-May be absolute if the zig_exe_path points to a locally installed Zig executable.
-""",
-    "zig_lib_path": "Path to the Zig library directory for the target platform.",
-    "zig_lib_rpath": """\
-Rlocation path to the Zig library directory for the target platform.
-
-May be absolute if the zig_exe_path points to a locally installed Zig executable.
-""",
-    "zig_files": """\
-Files required in runfiles to make the Zig executable available.
-
-May be empty if the zig_exe_path points to a locally installed Zig executable.
-""",
+    "zig_exe": "File for the Zig executable.",
+    "zig_h": "File for the Zig header at the root of the Zig lib directory.",
+    "zig_lib": "File for the Zig lib source directory.",
     "zig_version": "String, The Zig toolchain's version.",
     "zig_cache": "String, The Zig cache directory prefix used for the global and local cache.",
 }

zig/private/repo/BUILD.bazel

@@ -6,7 +6,6 @@ bzl_library(
     visibility = ["//zig:__subpackages__"],
     deps = [
         "//zig/private/common:zig_cache",
-        "@bazel_skylib//lib:paths",
         "@bazel_tools//tools/build_defs/repo:utils.bzl",
     ],
 )

zig/private/repo/zig_repository.bzl

@@ -77,9 +77,7 @@ def _zig_repository_impl(repository_ctx):
         repository_ctx.attr.platform,
     )
 
-    zig_exe = "zig"
-    if repository_ctx.attr.platform.find("windows") != -1:
-        zig_exe = "zig.exe"
+    zig_exe = "zig.exe" if repository_ctx.attr.platform.find("windows") != -1 else "zig"
 
     build_content = """\
 # Generated by zig/private/repo/zig_repository.bzl
@@ -89,8 +87,8 @@ load("@rules_zig//zig:toolchain.bzl", "zig_toolchain")
 zig_toolchain(
     name = "zig_toolchain",
     zig_exe = {zig_exe},
-    zig_lib = glob(["lib/**"]),
-    zig_lib_path = "lib",
+    zig_h = "lib/zig.h",
+    zig_lib = "lib",
     zig_version = {zig_version},
     zig_cache = {zig_cache},
 )