diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2018-05-16 06:34:19 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-16 06:35:30 -0700 |
| commit | 7092ed324137f03fcd34856bdb0595a1bdec3069 (patch) | |
| tree | cc25e3ecbab2ba2bbe2a7c7a24a4d51493249e85 /tools | |
| parent | b6eae7754c434c31f87ce84a06e017d603eb6f78 (diff) | |
Remove unneeded exec_compatible_with from local_sh_toolchain
Since that restriction is not necessary at the moment, we can as well
not compute it in the first place.
Potentially to be cherry-picked for 0.14.0, see #5056.
Change-Id: Ic2d4ec1b037ce464e85e243b69bedd483bc515ac
PiperOrigin-RevId: 196819791
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/sh/sh_configure.bzl | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/tools/sh/sh_configure.bzl b/tools/sh/sh_configure.bzl index cfae3271b0..f7c8899420 100644 --- a/tools/sh/sh_configure.bzl +++ b/tools/sh/sh_configure.bzl @@ -49,18 +49,6 @@ def _sh_config_impl(repository_ctx): if sh_path and _is_windows(repository_ctx): sh_path = sh_path.replace("\\", "/") - os_label = None - if _is_windows(repository_ctx): - os_label = "@bazel_tools//platforms:windows" - elif repository_ctx.os.name.startswith("linux"): - os_label = "@bazel_tools//platforms:linux" - elif repository_ctx.os.name.startswith("mac"): - os_label = "@bazel_tools//platforms:osx" - elif repository_ctx.os.name.startswith("freebsd"): - os_label = "@bazel_tools//platforms:freebsd" - else: - fail("Unknown OS") - repository_ctx.file("BUILD", """ load("@bazel_tools//tools/sh:sh_toolchain.bzl", "sh_toolchain") @@ -72,14 +60,10 @@ sh_toolchain( toolchain( name = "local_sh_toolchain", - exec_compatible_with = [ - "@bazel_tools//platforms:x86_64", - "{os_label}", - ], toolchain = ":local_sh", toolchain_type = "@bazel_tools//tools/sh:toolchain_type", ) -""".format(sh_path = sh_path, os_label = os_label)) +""".format(sh_path = sh_path)) sh_config = repository_rule( environ = [ |