Skip to content

Commit b8751b8

Browse files
kckingUebelAndre
andauthored
add cc config info to dummy wasm32 cc toolchain (#1532)
fixes building with new cc toolchain resolution flag Co-authored-by: UebelAndre <[email protected]>
1 parent f5ed797 commit b8751b8

File tree

2 files changed

+46
-2
lines changed

2 files changed

+46
-2
lines changed
Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load(":dummy_cc_toolchain.bzl", "dummy_cc_toolchain")
1+
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
2+
load(":dummy_cc_toolchain.bzl", "dummy_cc_config", "dummy_cc_toolchain")
23

34
dummy_cc_toolchain(name = "dummy_cc_wasm32")
45

@@ -8,6 +9,29 @@ dummy_cc_toolchain(name = "dummy_cc_wasm32")
89
toolchain(
910
name = "dummy_cc_wasm32_toolchain",
1011
target_compatible_with = ["//rust/platform/cpu:wasm32"],
11-
toolchain = ":dummy_cc_wasm32",
12+
toolchain = ":dummy_cc_wasm32_toolchain_cc",
1213
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
1314
)
15+
16+
cc_toolchain(
17+
name = "dummy_cc_wasm32_toolchain_cc",
18+
all_files = ":empty",
19+
compiler_files = ":empty",
20+
dwp_files = ":empty",
21+
linker_files = ":empty",
22+
objcopy_files = ":empty",
23+
strip_files = ":empty",
24+
supports_param_files = 0,
25+
toolchain_config = ":cc_toolchain_config",
26+
toolchain_identifier = "dummy_wasm32_cc",
27+
)
28+
29+
dummy_cc_config(
30+
name = "cc_toolchain_config",
31+
)
32+
33+
filegroup(
34+
name = "empty",
35+
srcs = [],
36+
visibility = ["//:__subpackages__"],
37+
)

rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,23 @@ dummy_cc_toolchain = rule(
77
implementation = _dummy_cc_toolchain_impl,
88
attrs = {},
99
)
10+
11+
# dummy values from https://bazel.build/tutorials/ccp-toolchain-config#configuring_the_c_toolchain
12+
def _config_impl(ctx):
13+
return cc_common.create_cc_toolchain_config_info(
14+
ctx = ctx,
15+
toolchain_identifier = "dummy-wasm32-cc-toolchain",
16+
host_system_name = "unknown",
17+
target_system_name = "unknown",
18+
target_cpu = "unknown",
19+
target_libc = "unknown",
20+
compiler = "unknown",
21+
abi_version = "unknown",
22+
abi_libc_version = "unknown",
23+
)
24+
25+
dummy_cc_config = rule(
26+
implementation = _config_impl,
27+
attrs = {},
28+
provides = [CcToolchainConfigInfo],
29+
)

0 commit comments

Comments
 (0)