commit b8751b860b39b267e8839e4a79ce82daaad5792f
author Kevin King <kcking@users.noreply.github.com> Mon Aug 29 11:57:23 2022 -0700
committer GitHub <noreply@github.com> Mon Aug 29 18:57:23 2022 +0000
tree ca7cad5e1495b146f50b5c2a4ab0f6031bef236f
parent f5ed797ee42460bdf81306eab62f9330507e95c9

add cc config info to dummy wasm32 cc toolchain (#1532)

fixes building with new cc toolchain resolution flag

Co-authored-by: UebelAndre <github@uebelandre.com>

rust/private/dummy_cc_toolchain/BUILD.bazel

diff --git a/rust/private/dummy_cc_toolchain/BUILD.bazel b/rust/private/dummy_cc_toolchain/BUILD.bazel
index 004d233..848480f 100644
--- a/rust/private/dummy_cc_toolchain/BUILD.bazel
+++ b/rust/private/dummy_cc_toolchain/BUILD.bazel
@@ -1,4 +1,5 @@
-load(":dummy_cc_toolchain.bzl", "dummy_cc_toolchain")
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
+load(":dummy_cc_toolchain.bzl", "dummy_cc_config", "dummy_cc_toolchain")
 
 dummy_cc_toolchain(name = "dummy_cc_wasm32")
 
@@ -8,6 +9,29 @@
 toolchain(
     name = "dummy_cc_wasm32_toolchain",
     target_compatible_with = ["//rust/platform/cpu:wasm32"],
-    toolchain = ":dummy_cc_wasm32",
+    toolchain = ":dummy_cc_wasm32_toolchain_cc",
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
+
+cc_toolchain(
+    name = "dummy_cc_wasm32_toolchain_cc",
+    all_files = ":empty",
+    compiler_files = ":empty",
+    dwp_files = ":empty",
+    linker_files = ":empty",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    supports_param_files = 0,
+    toolchain_config = ":cc_toolchain_config",
+    toolchain_identifier = "dummy_wasm32_cc",
+)
+
+dummy_cc_config(
+    name = "cc_toolchain_config",
+)
+
+filegroup(
+    name = "empty",
+    srcs = [],
+    visibility = ["//:__subpackages__"],
+)

rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl

diff --git a/rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl b/rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl
index 8ca8c8f..e867564 100644
--- a/rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl
+++ b/rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl
@@ -7,3 +7,23 @@
     implementation = _dummy_cc_toolchain_impl,
     attrs = {},
 )
+
+# dummy values from https://bazel.build/tutorials/ccp-toolchain-config#configuring_the_c_toolchain
+def _config_impl(ctx):
+    return cc_common.create_cc_toolchain_config_info(
+        ctx = ctx,
+        toolchain_identifier = "dummy-wasm32-cc-toolchain",
+        host_system_name = "unknown",
+        target_system_name = "unknown",
+        target_cpu = "unknown",
+        target_libc = "unknown",
+        compiler = "unknown",
+        abi_version = "unknown",
+        abi_libc_version = "unknown",
+    )
+
+dummy_cc_config = rule(
+    implementation = _config_impl,
+    attrs = {},
+    provides = [CcToolchainConfigInfo],
+)