aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar plf <plf@google.com>2018-02-05 04:34:16 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-05 04:35:36 -0800
commit17830c25a816d67ba79e783acaa6a085b516bd43 (patch)
treebbec9bf37d927abf93319363efc2118ef26bd888 /src/main
parent6c1c0660dd51420160eb1c0f5eac7e67917a231c (diff)
C++: Remove last instatiation of CppModel outside CcLibraryHelper.
RELNOTES:none PiperOrigin-RevId: 184510731
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java14
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 7691c2e770..71d13162a8 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,7 +185,6 @@ public final class CppModel {
private final Predicate<String> coptsFilter;
private boolean fake;
private boolean maySaveTemps;
- private boolean onlySingleOutput;
private CcCompilationOutputs compilationOutputs;
// link model
@@ -276,17 +275,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) {
@@ -478,7 +466,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;
}