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: 184671661

1 files changed, 1 insertions, 13 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 8f84a7a3e5..6384c8a51f 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
@@ -186,7 +186,6 @@ public final class CppModel {
   private final Predicate<String> coptsFilter;
   private boolean fake;
   private boolean maySaveTemps;
-  private boolean onlySingleOutput;
   private CcCompilationOutputs compilationOutputs;
 
   // link model
@@ -277,17 +276,6 @@ 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) {
@@ -479,7 +467,7 @@ public final class CppModel {
 
     // Either you're only making a dynamic library (onlySingleOutput) or pic should be used
     // in all cases.
-    if (onlySingleOutput || usePicForBinaries) {
+    if (usePicForBinaries) {
       if (picFeatureEnabled) {
         return false;
       }