Default to PIC in MOCK_CROSSTOOL.

--
MOS_MIGRATED_REVID=108533147

3 files changed, 4 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL
index bb3773c244..3dd865918b 100644
--- a/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL
+++ b/src/test/java/com/google/devtools/build/lib/MOCK_CROSSTOOL
@@ -45,6 +45,8 @@ toolchain {
   tool_path { name: "objdump" path: "/usr/bin/objdump" }
   tool_path { name: "strip" path: "/usr/bin/strip" }
 
+  needsPic: true
+
   builtin_sysroot: ""
   cxx_flag: "-std=c++0x"
   linker_flag: "-lstdc++"
@@ -79,6 +81,8 @@ toolchain {
   tool_path { name: "objdump" path: "/usr/bin/objdump" }
   tool_path { name: "strip" path: "/usr/bin/strip" }
 
+  needsPic: true
+
   builtin_sysroot: ""
   cxx_flag: "-std=c++0x"
   linker_flag: "-lstdc++"
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
index 124e09c441..2a1a81aa5f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
@@ -115,7 +115,6 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
   // Regression test for:
   // "action conflict detection is incorrect if conflict is in non-top-level configured targets".
   public void testActionConflictInDependencyImpliesTopLevelTargetFailure() throws Exception {
-    useConfiguration("--force_pic");
     scratch.file("conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
         "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])",
@@ -136,7 +135,6 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
    * rigorously.
    */
   public void testNoActionConflictWithInvalidatedTarget() throws Exception {
-    useConfiguration("--force_pic");
     scratch.file("conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
         "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
@@ -159,7 +157,6 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
    * Generating the same output from multiple actions is causing an error.
    */
   public void testActionConflictCausesError() throws Exception {
-    useConfiguration("--force_pic");
     scratch.file("conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
         "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
@@ -170,7 +167,6 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
   }
 
   public void testNoActionConflictErrorAfterClearedAnalysis() throws Exception {
-    useConfiguration("--force_pic");
     scratch.file("conflict/BUILD",
                 "cc_library(name='x', srcs=['foo.cc'])",
                 "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
@@ -195,7 +191,6 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
    * error, and with multi-threaded analysis it is not deterministic which one that will be.
    */
   public void testActionConflictMarksTargetInvalid() throws Exception {
-    useConfiguration("--force_pic");
     scratch.file("conflict/BUILD",
         "cc_library(name='x', srcs=['foo.cc'])",
         "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index c725c12731..29ead3a7ec 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -759,7 +759,6 @@ public final class BuildViewTest extends BuildViewTestBase {
    * This is a regression test for a Bazel crash.
    */
   public void testPostProcessedConfigurableAttributes() throws Exception {
-    useConfiguration("--force_pic");
     reporter.removeHandler(failFastHandler); // Expect errors from action conflicts.
     scratch.file("conflict/BUILD",
         "config_setting(name = 'a', values = {'test_arg': 'a'})",