Commit 046e8fb7 authored by Adam Cozzette's avatar Adam Cozzette Committed by Jie Luo

Cherry-picked Bazel fix from PR #5085 (#5382)

* use flag_values = {"@bazel_tools//tools/cpp:compiler": "x"} for compiler config_settings

* Create compiler_config_setting.bzl
parent 740ff022
...@@ -39,10 +39,9 @@ COPTS = select({ ...@@ -39,10 +39,9 @@ COPTS = select({
], ],
}) })
config_setting( load(":compiler_config_setting.bzl", "create_compiler_config_setting")
name = "msvc",
values = { "compiler": "msvc-cl" }, create_compiler_config_setting(name = "msvc", value = "msvc-cl")
)
config_setting( config_setting(
name = "android", name = "android",
......
"""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},
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment