diff options
| author |  cpeyser <cpeyser@google.com> | 2017-12-21 08:42:50 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-21 08:44:56 -0800 |
| commit | 8fb14d5871088e32078812f21ef24189729e38cc (patch) | |
| tree | 4914754020479668a3fa946c158c36557b89a296 /tools | |
| parent | 57f228ab6fc8c871648e2f48bf97824566985f29 (diff) | |
Retire the filegroup //tools/cpp:toolchain_category in favor of the
cc_toolchain_type //tools/cpp:toolchain_type.
PiperOrigin-RevId: 179818065
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cpp/BUILD | 10 | ||||
| -rw-r--r-- | tools/cpp/BUILD.static | 9 | ||||
| -rw-r--r-- | tools/cpp/BUILD.tpl | 9 |
3 files changed, 12 insertions, 16 deletions
diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD index 5e5b6ffa16..8ae72fb483 100644 --- a/tools/cpp/BUILD +++ b/tools/cpp/BUILD @@ -205,23 +205,21 @@ filegroup( srcs = ["link_dynamic_library.sh"], ) -filegroup(name = "toolchain_type") +cc_toolchain_type(name = "toolchain_type") # A dummy toolchain is necessary to satisfy toolchain resolution until platforms # are used in c++ by default. # TODO(b/64754003): Remove once platforms are used in c++ by default. toolchain( - name = "dummy_cc_toolchain_type", + name = "dummy_cc_toolchain", toolchain = "dummy_cc_toolchain_impl", toolchain_type = ":toolchain_type", ) -filegroup(name = "toolchain_category") - toolchain( - name = "dummy_cc_toolchain", + name = "dummy_cc_toolchain_type", toolchain = "dummy_cc_toolchain_impl", - toolchain_type = ":toolchain_category", + toolchain_type = ":toolchain_type", ) load(":dummy_toolchain.bzl", "dummy_toolchain") diff --git a/tools/cpp/BUILD.static b/tools/cpp/BUILD.static index d5fc9a3d8b..eb5f113827 100644 --- a/tools/cpp/BUILD.static +++ b/tools/cpp/BUILD.static @@ -116,22 +116,21 @@ filegroup( srcs = ["link_dynamic_library.sh"], ) -filegroup(name = "toolchain_type") +cc_toolchain_type(name = "toolchain_type") # A dummy toolchain is necessary to satisfy toolchain resolution until platforms # are used in c++ by default. # TODO(b/64754003): Remove once platforms are used in c++ by default. toolchain( - name = "dummy_cc_toolchain_type", + name = "dummy_cc_toolchain", toolchain = "dummy_cc_toolchain_impl", toolchain_type = ":toolchain_type", ) -filegroup(name = "toolchain_category") toolchain( - name = "dummy_cc_toolchain", + name = "dummy_cc_toolchain_type", toolchain = "dummy_cc_toolchain_impl", - toolchain_type = ":toolchain_category", + toolchain_type = ":toolchain_type", ) load(":dummy_toolchain.bzl", "dummy_toolchain") diff --git a/tools/cpp/BUILD.tpl b/tools/cpp/BUILD.tpl index 7b22d8832f..26a8a47d6a 100644 --- a/tools/cpp/BUILD.tpl +++ b/tools/cpp/BUILD.tpl @@ -97,22 +97,21 @@ cc_toolchain( supports_param_files = 1, ) -filegroup(name = "toolchain_type") +cc_toolchain_type(name = "toolchain_type") # A dummy toolchain is necessary to satisfy toolchain resolution until platforms # are used in c++ by default. # TODO(b/64754003): Remove once platforms are used in c++ by default. toolchain( - name = "dummy_cc_toolchain_type", + name = "dummy_cc_toolchain", toolchain = "dummy_cc_toolchain_impl", toolchain_type = ":toolchain_type", ) -filegroup(name = "toolchain_category") toolchain( - name = "dummy_cc_toolchain", + name = "dummy_cc_toolchain_type", toolchain = "dummy_cc_toolchain_impl", - toolchain_type = ":toolchain_category", + toolchain_type = ":toolchain_type", ) load(":dummy_toolchain.bzl", "dummy_toolchain") |