Add missing C++ toolchain to zls.

This commit is contained in:
Tarry Singh 2025-11-10 09:44:11 +00:00
parent 94c5bbcfa6
commit 8f50d19cba
2 changed files with 3 additions and 34 deletions

View File

@ -27,38 +27,6 @@ exports_files(
], ],
) )
zig_binary(
name = "runner",
main = "runner.zig",
data = [
"//zig:resolved_toolchain",
],
deps = ["@rules_zig//zig/runfiles"],
)
bzl_library(
name = "zls_completion",
srcs = ["zls_completion.bzl"],
visibility = ["//visibility:public"],
deps = [
"//zig/private/common:zig_build",
"//zig/private/providers:zig_module_info",
],
)
bzl_library(
name = "zls_toolchain",
srcs = ["zls_toolchain.bzl"],
visibility = ["//visibility:public"],
deps = ["@bazel_tools//tools/build_defs/repo:http.bzl"],
)
bzl_library(
name = "zls_runner",
srcs = ["zls_runner.bzl"],
visibility = ["//visibility:public"],
)
# Execute `bazel run //util:update_filegroups` to update this target. # Execute `bazel run //util:update_filegroups` to update this target.
filegroup( filegroup(
name = "all_files", name = "all_files",
@ -70,5 +38,5 @@ filegroup(
":zls_runner.zig", ":zls_runner.zig",
":zls_toolchain.bzl", ":zls_toolchain.bzl",
], ],
visibility = ["//zig:__pkg__"], visibility = ["@rules_zig//zig:__pkg__"],
) )

View File

@ -2,6 +2,7 @@
load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
load("@rules_zig//zig/private:cc_helper.bzl", "need_translate_c") load("@rules_zig//zig/private:cc_helper.bzl", "need_translate_c")
load("@rules_zig//zig/private/common:translate_c.bzl", "zig_translate_c") load("@rules_zig//zig/private/common:translate_c.bzl", "zig_translate_c")
load("@rules_zig//zig/private/common:zig_cache.bzl", "zig_cache_output") load("@rules_zig//zig/private/common:zig_cache.bzl", "zig_cache_output")
@ -133,6 +134,6 @@ zls_write_build_config = rule(
toolchains = [ toolchains = [
"@rules_zig//zig:toolchain_type", "@rules_zig//zig:toolchain_type",
"@rules_zig//zig/target:toolchain_type", "@rules_zig//zig/target:toolchain_type",
], ] + use_cc_toolchain(mandatory = False),
fragments = ["cpp"], fragments = ["cpp"],
) )