Flip the default value of --incompatible_disable_depset_in_cc_user_flags

Fixes #6383. RELNOTES: None. PiperOrigin-RevId: 223516016
bazelbuild · Nov 30, 2018 · c3e2de3 · c3e2de3
1 parent 345685d
commit c3e2de3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -767,7 +767,7 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_disable_depset_in_cc_user_flags",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
@@ -505,6 +505,7 @@ public void testCompileBuildVariablesForPic() throws Exception {
 
   @Test
   public void testUserCompileFlags() throws Exception {
+    useConfiguration("--noincompatible_disable_depset_in_cc_user_flags");
     assertThat(
             commandLineForVariables(
                 CppActionNames.CPP_COMPILE,
@@ -651,6 +652,7 @@ public void testRuntimeLibrarySearchDirectoriesLinkVariables() throws Exception
 
   @Test
   public void testUserLinkFlagsLinkVariables() throws Exception {
+    useConfiguration("--noincompatible_disable_depset_in_cc_user_flags");
     assertThat(
             commandLineForVariables(
                 CppActionNames.CPP_LINK_EXECUTABLE,