Permalink
Browse files

Merge pull request #5085 from scentini/compiler-flag

Route "compiler" value of config_setting through @bazel_tools/tools/cpp:compiler.
  • Loading branch information...
xfxyjwf committed Sep 10, 2018
2 parents baa4a21 + 664f927 commit ff3891dab1b1f462d90a68666d14f57eb5fea34f
Showing with 24 additions and 4 deletions.
  1. +3 −4 BUILD
  2. +21 −0 compiler_config_setting.bzl
View
7 BUILD
@@ -52,10 +52,9 @@ COPTS = select({
],
})
config_setting(
name = "msvc",
values = { "compiler": "msvc-cl" },
)
load(":compiler_config_setting.bzl", "create_compiler_config_setting")
create_compiler_config_setting(name = "msvc", value = "msvc-cl")
config_setting(
name = "android",
@@ -0,0 +1,21 @@
"""Creates config_setting that allows selecting based on 'compiler' value."""
def create_compiler_config_setting(name, value):
# The "do_not_use_tools_cpp_compiler_present" attribute exists to
# distinguish between older versions of Bazel that do not support
# "@bazel_tools//tools/cpp:compiler" flag_value, and newer ones that do.
# In the future, the only way to select on the compiler will be through
# flag_values{"@bazel_tools//tools/cpp:compiler"} and the else branch can
# be removed.
if hasattr(cc_common, "do_not_use_tools_cpp_compiler_present"):
native.config_setting(
name = name,
flag_values = {
"@bazel_tools//tools/cpp:compiler": value,
},
)
else:
native.config_setting(
name = name,
values = {"compiler": value},
)

0 comments on commit ff3891d

Please sign in to comment.