Flip --incompatible_require_feature_configuration_for_pic

Fixes #7007. RELNOTES: --incompatible_require_feature_configuration_for_pic was flipped (#7007). PiperOrigin-RevId: 229522013
bazelbuild · Jan 16, 2019 · 6c0707a · 6c0707a
1 parent 19d650c
commit 6c0707a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
@@ -218,7 +218,7 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable
 
   @Option(
       name = "incompatible_require_feature_configuration_for_pic",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -229,7 +229,7 @@ public static Builder builderWithDefaults() {
           .incompatibleNoTargetOutputGroup(false)
           .incompatibleNoTransitiveLoads(false)
           .incompatibleRemoveNativeMavenJar(false)
-          .incompatibleRequireFeatureConfigurationForPic(false)
+          .incompatibleRequireFeatureConfigurationForPic(true)
           .incompatibleStricArgumentOrdering(false)
           .incompatibleStringIsNotIterable(true)
           .internalSkylarkFlagTestCanary(false)

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
@@ -49,12 +49,15 @@ public void testSkylarkCallables() throws Exception {
         "test/rule.bzl",
         "def _impl(ctx):",
         "  provider = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]",
+        "  feature_configuration = cc_common.configure_features(cc_toolchain = provider)",
         "  return struct(",
         "    dirs = provider.built_in_include_directories,",
         "    sysroot = provider.sysroot,",
         "    cpu = provider.cpu,",
         "    ar_executable = provider.ar_executable,",
-        "    use_pic_for_dynamic_libraries = provider.use_pic_for_dynamic_libraries,",
+        "    use_pic_for_dynamic_libraries = provider.needs_pic_for_dynamic_libraries(",
+        "      feature_configuration = feature_configuration,",
+        "    ),",
         "  )",
         "",
         "my_rule = rule(",