Skip to content

Commit

Permalink
Remove unneeded exec_compatible_with from local_sh_toolchain
Browse files Browse the repository at this point in the history
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 bazelbuild#5056.

Change-Id: Ic2d4ec1b037ce464e85e243b69bedd483bc515ac
PiperOrigin-RevId: 196819791
  • Loading branch information
aehlig authored and Copybara-Service committed May 16, 2018
1 parent b6eae77 commit 7092ed3
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions tools/sh/sh_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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 = [
Expand Down

0 comments on commit 7092ed3

Please sign in to comment.