commit 3ce44b6e0d19944cdb09cc9fd0b06bd4d89f2e36
author hlopko <hlopko@google.com> Wed Jan 02 08:02:29 2019 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Jan 02 08:04:17 2019 -0800
tree 8758a83f8a6a3c3b01590313033b47904da47a33
parent 1d36051776557bbcbba1a8f0d98e5a408a717d11

Add --incompatible_disable_expand_if_all_available_in_flag_set

Corresponding issue: https://github.com/bazelbuild/bazel/issues/7008

RELNOTES: None.
PiperOrigin-RevId: 227522028

tools/cpp/CROSSTOOL

diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 5b9cd3d..8e190a4 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -651,7 +651,6 @@
   feature {
     name: 'legacy_compile_flags'
     flag_set {
-      expand_if_all_available: 'legacy_compile_flags'
       action: 'assemble'
       action: 'preprocess-assemble'
       action: 'c-compile'
@@ -660,6 +659,7 @@
       action: 'c++-module-compile'
       action: 'c++-module-codegen'
       flag_group {
+        expand_if_all_available: 'legacy_compile_flags'
         iterate_over: 'legacy_compile_flags'
         flag: '%{legacy_compile_flags}'
       }
@@ -698,8 +698,8 @@
       action: 'c++-compile'
       action: 'c++-module-compile'
       action: 'c++-header-parsing'
-      expand_if_all_available: 'dependency_file'
       flag_group {
+        expand_if_all_available: 'dependency_file'
         flag: '/DEPENDENCY_FILE'
         flag: '%{dependency_file}'
       }
@@ -709,7 +709,6 @@
   feature {
     name: 'user_compile_flags'
     flag_set {
-      expand_if_all_available: 'user_compile_flags'
       action: 'assemble'
       action: 'preprocess-assemble'
       action: 'c-compile'
@@ -718,6 +717,7 @@
       action: 'c++-module-compile'
       action: 'c++-module-codegen'
       flag_group {
+        expand_if_all_available: 'user_compile_flags'
         iterate_over: 'user_compile_flags'
         flag: '%{user_compile_flags}'
       }
@@ -727,7 +727,6 @@
   feature {
     name: 'sysroot'
     flag_set {
-      expand_if_all_available: 'sysroot'
       action: 'assemble'
       action: 'preprocess-assemble'
       action: 'c-compile'
@@ -739,6 +738,7 @@
       action: 'c++-link-dynamic-library'
       action: 'c++-link-nodeps-dynamic-library'
       flag_group {
+        expand_if_all_available: 'sysroot'
         iterate_over: 'sysroot'
         flag: '--sysroot=%{sysroot}'
       }
@@ -748,7 +748,6 @@
   feature {
     name: 'unfiltered_compile_flags'
     flag_set {
-      expand_if_all_available: 'unfiltered_compile_flags'
       action: 'assemble'
       action: 'preprocess-assemble'
       action: 'c-compile'
@@ -757,6 +756,7 @@
       action: 'c++-module-compile'
       action: 'c++-module-codegen'
       flag_group {
+        expand_if_all_available: 'unfiltered_compile_flags'
         iterate_over: 'unfiltered_compile_flags'
         flag: '%{unfiltered_compile_flags}'
       }