Automated rollback of commit 873f343fefbb08048e7e75c482843b9e68954de6.

*** Reason for rollback ***

Breaking targets in 2018.02.08 and 2018.02.09 nightly TGPs

There were some merge conflicts in this rollback CL. See unknown commit for the unresolved version. I kept the YOURS sections, and ran fiximports.py to remove unused imports.

See b/73157879

*** Original change description ***

C++: Remove last instatiation of CppModel outside CcLibraryHelper.

This is the second try for this CL. The first one caused Blaze to crash when building Exoblaze as shown in b/72936965. In this CL I fix the condition of when to generate non-PIC compilation actions for WrapCcHelper.

RELNOTES:none
PiperOrigin-RevId: 185203398

1 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
index 34c625b5b9..ff84f58e1b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
@@ -185,6 +185,7 @@ public final class CppModel {
   private final CoptsFilter coptsFilter;
   private boolean fake;
   private boolean maySaveTemps;
+  private boolean onlySingleOutput;
   private CcCompilationOutputs compilationOutputs;
 
   // link model
@@ -275,6 +276,17 @@ public final class CppModel {
   }
 
   /**
+   * If set, the CppModel only creates a single .o output that can be linked into a dynamic library,
+   * i.e., it never generates both PIC and non-PIC outputs. Otherwise it creates outputs that can be
+   * linked into both static binaries and dynamic libraries (if both require PIC or both require
+   * non-PIC, then it still only creates a single output). Defaults to false.
+   */
+  public CppModel setOnlySingleOutput(boolean onlySingleOutput) {
+    this.onlySingleOutput = onlySingleOutput;
+    return this;
+  }
+
+  /**
    * Whether to create actions for temps. This defaults to false.
    */
   public CppModel setSaveTemps(boolean maySaveTemps) {
@@ -466,7 +478,7 @@ public final class CppModel {
 
     // Either you're only making a dynamic library (onlySingleOutput) or pic should be used
     // in all cases.
-    if (usePicForBinaries) {
+    if (onlySingleOutput || usePicForBinaries) {
       if (picFeatureEnabled) {
         return false;
       }