aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-06-22 12:54:07 +0000
committerGravatar Lukacs Berki <lberki@google.com>2016-06-23 11:00:37 +0000
commit54dc8117f8166150f666bdfe805ea848a8fccd1c (patch)
treebdf9d9a994fc60734bbaef6e9dc6aaa5064d5b15
parent9934f15497fbd466156e0f3f4e804cba229cbb13 (diff)
Make CppConfiguration.isLipoOptimizationOrInstrumentation() return false in LIPO context collector mode.
-- MOS_MIGRATED_REVID=125557199
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index 49887706c3..9889401014 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -1592,7 +1592,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
}
public boolean isLipoOptimizationOrInstrumentation() {
- return cppOptions.isLipoOptimizationOrInstrumentation();
+ return cppOptions.isLipoOptimizationOrInstrumentation() && !isLipoContextCollector();
}
/**