Skip to content

Commit

Permalink
C++: Remove last instatiation of CppModel outside CcLibraryHelper.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 185354353
  • Loading branch information
oquenchil authored and Copybara-Service committed Feb 12, 2018
1 parent 9b96c0b commit 4e9c9f9
Showing 1 changed file with 1 addition and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ public final class CppModel {
private final CoptsFilter coptsFilter;
private boolean fake;
private boolean maySaveTemps;
private boolean onlySingleOutput;
private CcCompilationOutputs compilationOutputs;

// link model
Expand Down Expand Up @@ -275,17 +274,6 @@ public CppModel setFake(boolean fake) {
return this;
}

/**
* 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.
*/
Expand Down Expand Up @@ -478,7 +466,7 @@ private boolean getGenerateNoPicActions() {

// 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;
}
Expand Down

0 comments on commit 4e9c9f9

Please sign in to comment.