diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-05-31 15:30:06 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-05-31 18:07:36 +0000 |
| commit | a8efe484a666a36cb545114c272e4e07cc3b3b5a (patch) | |
| tree | 4795f6b6e302e87ca44baf3fd82c2408820bb8f9 /tools | |
| parent | aeac12c8ccf1571fd8775e1ebf0057099b4aafb8 (diff) | |
cc_configure: removes -no-canonical-prefixes from the list of default flags
This might causes problem in a future remote execution services but
in that kind of service it would make more sense to not use the
auto-configured C++ toolchain.
Tested with bazel test //tools/cpp/test:*
Fixes #1204.
--
MOS_MIGRATED_REVID=123643630
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cpp/cc_configure.bzl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl index 364305e0a1..d31a35552c 100644 --- a/tools/cpp/cc_configure.bzl +++ b/tools/cpp/cc_configure.bzl @@ -180,8 +180,7 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin): "-lstdc++", "-lm", # Some systems expect -lm in addition to -lstdc++ # Anticipated future default. - ] + _add_option_if_supported(repository_ctx, cc, "-no-canonical-prefixes") + - _add_option_if_supported(repository_ctx, cc, "-Wl,-no-as-needed") + ( + ] + _add_option_if_supported(repository_ctx, cc, "-Wl,-no-as-needed") + ( [ "-undefined", "dynamic_lookup", @@ -203,8 +202,6 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin): "cxx_builtin_include_directory": _get_cxx_inc_directories(repository_ctx, cc), "objcopy_embed_flag": ["-I", "binary"], "unfiltered_cxx_flag": - # Anticipated future default. - _add_option_if_supported(repository_ctx, cc, "-no-canonical-prefixes") + _add_option_if_supported(repository_ctx, cc, "-fno-canonical-system-headers") + [ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. |