Remove toolchain_identifier

Author: dzbarsky

cc/private/compile/compile_build_variables.bzl

@@ -618,7 +618,6 @@ def _compute_all_linkstamp_defines(
         code_coverage_enabled):
     """Computes defines for linkstamp compilation."""
     defines = [
-        'GPLATFORM="' + cc_toolchain.toolchain_id + '"',
         "BUILD_COVERAGE_ENABLED=" + ("1" if code_coverage_enabled else "0"),
         # G3_TARGET_NAME is a C string literal that normally contain the label of the target
         # being linked.  However, they are set differently when using shared native deps. In

cc/private/rules_impl/cc_toolchain.bzl

@@ -186,18 +186,6 @@ cc_toolchain = rule(
         "licenses": attr.license() if hasattr(attr, "license") else attr.string_list(),
         # buildifier: disable=attr-license
         "output_licenses": attr.license() if hasattr(attr, "license") else attr.string_list(),
-        "toolchain_identifier": attr.string(
-            default = "",
-            doc = """
-The identifier used to match this cc_toolchain with the corresponding
-crosstool_config.toolchain.
-
-<p>
-  Until issue <a href="https://github.com/bazelbuild/bazel/issues/5380">#5380</a> is fixed
-  this is the recommended way of associating <code>cc_toolchain</code> with
-  <code>CROSSTOOL.toolchain</code>. It will be replaced by the <code>toolchain_config</code>
-  attribute (<a href="https://github.com/bazelbuild/bazel/issues/5380">#5380</a>).</p>""",
-        ),
         "all_files": attr.label(
             allow_files = True,
             mandatory = True,

cc/private/rules_impl/cc_toolchain_info.bzl

@@ -105,7 +105,6 @@ def _create_cc_toolchain_info(
         libc = toolchain_config_info.target_libc,
         cpu = toolchain_config_info.target_cpu,
         target_gnu_system_name = toolchain_config_info.target_system_name,
-        toolchain_id = toolchain_config_info.toolchain_id,
         dynamic_runtime_solib_dir = dynamic_runtime_solib_dir,
         objcopy_executable = objcopy_executable,
         compiler_executable = compiler_executable,
@@ -192,7 +191,6 @@ CcToolchainInfo, _ = provider(
         "libc": "libc version string.",
         "cpu": "Target CPU of the C++ toolchain.",
         "target_gnu_system_name": "The GNU System Name.",
-        "toolchain_id": "",
         "dynamic_runtime_solib_dir": "",
         "objcopy_executable": "The path to the objcopy binary.",
         "compiler_executable": "The path to the compiler binary.",

cc/private/toolchain/BUILD.empty.tpl

@@ -51,7 +51,6 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     toolchain_config = ":local_config",
-    toolchain_identifier = "local",
 )
 
 cc_toolchain_config(name = "local_config")

cc/private/toolchain/BUILD.static.bsd

@@ -73,7 +73,6 @@ cc_toolchain(
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_config = ":local_freebsd",
-    toolchain_identifier = "local_freebsd",
 )
 
 cc_toolchain_config(
@@ -107,7 +106,6 @@ cc_toolchain(
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_config = ":local_openbsd",
-    toolchain_identifier = "local_openbsd",
 )
 
 cc_toolchain_config(
@@ -141,7 +139,6 @@ cc_toolchain(
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_config = ":stub_armeabi-v7a",
-    toolchain_identifier = "stub_armeabi-v7a",
 )
 
 cc_toolchain_config(

cc/private/toolchain/BUILD.tpl

@@ -85,8 +85,7 @@ cc_toolchain_suite(
 
 cc_toolchain(
     name = "cc-compiler-%{name}",
-    toolchain_identifier = "%{cc_toolchain_identifier}",
-    toolchain_config = ":%{cc_toolchain_identifier}",
+    toolchain_config = ":cc-config-%{name}",
     all_files = ":compiler_deps",
     ar_files = ":compiler_deps",
     as_files = ":compiler_deps",
@@ -101,10 +100,9 @@ cc_toolchain(
 )
 
 cc_toolchain_config(
-    name = "%{cc_toolchain_identifier}",
+    name = ":cc-config-%{name}",
     cpu = "%{target_cpu}",
     compiler = "%{compiler}",
-    toolchain_identifier = "%{cc_toolchain_identifier}",
     host_system_name = "%{host_system_name}",
     target_system_name = "%{target_system_name}",
     target_libc = "%{target_libc}",
@@ -131,7 +129,6 @@ cc_toolchain_config(
 # Android tooling requires a default toolchain for the armeabi-v7a cpu.
 cc_toolchain(
     name = "cc-compiler-armeabi-v7a",
-    toolchain_identifier = "stub_armeabi-v7a",
     toolchain_config = ":stub_armeabi-v7a",
     all_files = ":empty",
     ar_files = ":empty",

cc/private/toolchain/BUILD.windows.tpl

@@ -99,7 +99,6 @@ cc_toolchain_suite(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows_msys",
-    toolchain_identifier = "msys_x64",
     toolchain_config = ":msys_x64",
     all_files = ":empty",
     ar_files = ":empty",
@@ -143,7 +142,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_x86_windows_msys",
-    toolchain_identifier = "msys_x64_x86",
     toolchain_config = ":msys_x64_x86",
     all_files = ":empty",
     ar_files = ":empty",
@@ -189,7 +187,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows_mingw",
-    toolchain_identifier = "msys_x64_mingw",
     toolchain_config = ":msys_x64_mingw",
     all_files = ":empty",
     ar_files = ":empty",
@@ -233,7 +230,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_x86_windows_mingw",
-    toolchain_identifier = "msys_x64_x86_mingw",
     toolchain_config = ":msys_x64_x86_mingw",
     all_files = ":empty",
     ar_files = ":empty",
@@ -279,7 +275,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows",
-    toolchain_identifier = "msvc_x64",
     toolchain_config = ":msvc_x64",
     all_files = ":empty",
     ar_files = ":empty",
@@ -301,7 +296,6 @@ cc_toolchain_config(
     target_libc = "msvcrt",
     abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "msvc_x64",
     msvc_env_tmp = "%{msvc_env_tmp_x64}",
     msvc_env_path = "%{msvc_env_path_x64}",
     msvc_env_include = "%{msvc_env_include_x64}",
@@ -349,7 +343,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_x86_windows",
-    toolchain_identifier = "msvc_x64_x86",
     toolchain_config = ":msvc_x64_x86",
     all_files = ":empty",
     ar_files = ":empty",
@@ -371,7 +364,6 @@ cc_toolchain_config(
     target_libc = "msvcrt",
     abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "msvc_x64_x86",
     msvc_env_tmp = "%{msvc_env_tmp_x86}",
     msvc_env_path = "%{msvc_env_path_x86}",
     msvc_env_include = "%{msvc_env_include_x86}",
@@ -419,7 +411,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_arm_windows",
-    toolchain_identifier = "msvc_x64_arm",
     toolchain_config = ":msvc_x64_arm",
     all_files = ":empty",
     ar_files = ":empty",
@@ -441,7 +432,6 @@ cc_toolchain_config(
     target_libc = "msvcrt",
     abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "msvc_x64_arm",
     msvc_env_tmp = "%{msvc_env_tmp_arm}",
     msvc_env_path = "%{msvc_env_path_arm}",
     msvc_env_include = "%{msvc_env_include_arm}",
@@ -489,7 +479,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-arm64_windows",
-    toolchain_identifier = "msvc_arm64",
     toolchain_config = ":msvc_arm64",
     all_files = ":empty",
     ar_files = ":empty",
@@ -511,7 +500,6 @@ cc_toolchain_config(
     target_libc = "msvcrt",
     abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "msvc_arm64",
     msvc_env_tmp = "%{msvc_env_tmp_arm64}",
     msvc_env_path = "%{msvc_env_path_arm64}",
     msvc_env_include = "%{msvc_env_include_arm64}",
@@ -559,7 +547,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-x64_windows-clang-cl",
-    toolchain_identifier = "clang_cl_x64",
     toolchain_config = ":clang_cl_x64",
     all_files = ":empty",
     ar_files = ":empty",
@@ -581,7 +568,6 @@ cc_toolchain_config(
     target_libc = "msvcrt",
     abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "clang_cl_x64",
     msvc_env_tmp = "%{clang_cl_env_tmp_x64}",
     msvc_env_path = "%{clang_cl_env_path_x64}",
     msvc_env_include = "%{clang_cl_env_include_x64}",
@@ -627,7 +613,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-arm64_windows-clang-cl",
-    toolchain_identifier = "clang_cl_arm64",
     toolchain_config = ":clang_cl_arm64",
     all_files = ":empty",
     ar_files = ":empty",
@@ -649,7 +634,6 @@ cc_toolchain_config(
     target_libc = "msvcrt",
     abi_version = "local",
     abi_libc_version = "local",
-    toolchain_identifier = "clang_cl_arm64",
     msvc_env_tmp = "%{clang_cl_env_tmp_arm64}",
     msvc_env_path = "%{clang_cl_env_path_arm64}",
     msvc_env_include = "%{clang_cl_env_include_arm64}",
@@ -694,7 +678,6 @@ toolchain(
 
 cc_toolchain(
     name = "cc-compiler-armeabi-v7a",
-    toolchain_identifier = "stub_armeabi-v7a",
     toolchain_config = ":stub_armeabi-v7a",
     all_files = ":empty",
     ar_files = ":empty",

cc/private/toolchain/armeabi_cc_toolchain_config.bzl

@@ -22,7 +22,6 @@ load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
 
 def _impl(ctx):
-    toolchain_identifier = "stub_armeabi-v7a"
     host_system_name = "armeabi-v7a"
     target_system_name = "armeabi-v7a"
     target_cpu = "armeabi-v7a"
@@ -63,7 +62,6 @@ def _impl(ctx):
         action_configs = action_configs,
         artifact_name_patterns = artifact_name_patterns,
         cxx_builtin_include_directories = cxx_builtin_include_directories,
-        toolchain_identifier = toolchain_identifier,
         host_system_name = host_system_name,
         target_system_name = target_system_name,
         target_cpu = target_cpu,

cc/private/toolchain/bsd_cc_toolchain_config.bzl

@@ -59,7 +59,6 @@ def _impl(ctx):
     cpu = ctx.attr.cpu
     is_bsd = cpu == "freebsd" or cpu == "openbsd"
     compiler = "compiler"
-    toolchain_identifier = "local_{}".format(cpu) if is_bsd else "stub_armeabi-v7a"
     host_system_name = "local" if is_bsd else "armeabi-v7a"
     target_system_name = "local" if is_bsd else "armeabi-v7a"
     target_libc = "local" if is_bsd else "armeabi-v7a"
@@ -284,7 +283,6 @@ def _impl(ctx):
             features = features,
             action_configs = action_configs,
             cxx_builtin_include_directories = cxx_builtin_include_directories,
-            toolchain_identifier = toolchain_identifier,
             host_system_name = host_system_name,
             target_system_name = target_system_name,
             target_cpu = cpu,

cc/private/toolchain/empty_cc_toolchain_config.bzl

@@ -22,7 +22,6 @@ def _impl(ctx):
     return [
         cc_common.create_cc_toolchain_config_info(
             ctx = ctx,
-            toolchain_identifier = "local_linux",
             host_system_name = "local",
             target_system_name = "local",
             target_cpu = "local",