Do not enable random features in cc_common.configure_features

This change removes some hardcoded feature names when #6861 is flipped. RELNOTES: None. PiperOrigin-RevId: 227110386
bazelbuild · Dec 28, 2018 · 1be4cbc · 1be4cbc
1 parent c1b4912
commit 1be4cbc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/site/docs/crosstool-reference.md b/site/docs/crosstool-reference.md
@@ -988,18 +988,6 @@ conditions.
    <td>Enabled by default based on linking mode.
    </td>
   </tr>
-  <tr>
-   <td><strong><code>random_seed</code></strong>
-   </td>
-   <td>Enabled by default.
-   </td>
-  </tr>
-  <tr>
-   <td><strong><code>dependency_file</code></strong>
-   </td>
-   <td>Enabled by default.
-   </td>
-  </tr>
   <tr>
    <td><strong><code>per_object_debug_info</code></strong>
    </td>

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -859,7 +859,10 @@ public static FeatureConfiguration configureFeaturesOrThrowEvalException(
     ImmutableList.Builder<String> allFeatures =
         new ImmutableList.Builder<String>()
             .addAll(ImmutableSet.of(toolchain.getCompilationMode().toString()))
-            .addAll(DEFAULT_FEATURES)
+            .addAll(
+                cppConfiguration.disableLegacyCrosstoolFields()
+                    ? ImmutableList.of()
+                    : DEFAULT_FEATURES)
             .addAll(DEFAULT_ACTION_CONFIGS)
             .addAll(requestedFeatures)
             .addAll(toolchain.getFeatures().getDefaultFeaturesAndActionConfigs());

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
@@ -88,6 +88,7 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                 Joiner.on("\n")
                     .join(
                         "  name: 'dependency_file'",
+                        "  enabled: true",
                         "  flag_set {",
                         "    action: 'assemble'",
                         "    action: 'preprocess-assemble'",
@@ -118,6 +119,7 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                 Joiner.on("\n")
                     .join(
                         "  name: 'random_seed'",
+                        "  enabled: true",
                         "  flag_set {",
                         "    action: 'c-compile'",
                         "    action: 'c++-compile'",
@@ -135,6 +137,7 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                 Joiner.on("\n")
                     .join(
                         "  name: 'pic'",
+                        "  enabled: true",
                         "  flag_set {",
                         "    action: 'assemble'",
                         "    action: 'preprocess-assemble'",
@@ -173,6 +176,7 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                 Joiner.on("\n")
                     .join(
                         "  name: 'preprocessor_defines'",
+                        "  enabled: true",
                         "  flag_set {",
                         "    action: 'preprocess-assemble'",
                         "    action: 'linkstamp-compile'",
@@ -218,6 +222,7 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                 Joiner.on("\n")
                     .join(
                         "  name: 'include_paths'",
+                        "  enabled: true",
                         "  flag_set {",
                         "    action: 'preprocess-assemble'",
                         "    action: 'linkstamp-compile'",