diff options
author | 2017-07-12 17:51:05 +0200 | |
---|---|---|
committer | 2017-07-13 09:52:55 +0200 | |
commit | 4ddc9376d95bb573b020d5beea81b24763010f5b (patch) | |
tree | 39e6e2fca466e96b7e5191545fdc5b425c06a510 /src/main/java/com/google/devtools/build/lib | |
parent | 90495e1f2e01572d3be5c2e230926f859b9597d7 (diff) |
Fix compiler detection when mapping LIPO to ThinLTO
RELNOTES: None
PiperOrigin-RevId: 161670197
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 6 |
1 files changed, 4 insertions, 2 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 bc5d6ce171..73a3535b49 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 @@ -1602,7 +1602,8 @@ public class CppConfiguration extends BuildConfiguration.Fragment { */ public boolean isLipoOptimization() { // The LIPO optimization bits are set in the LIPO context collector configuration, too. - return cppOptions.isLipoOptimization(); + // If compiler is LLVM, then LIPO gets auto-converted to ThinLTO. + return cppOptions.isLipoOptimization() && !isLLVMCompiler(); } /** @@ -1612,7 +1613,8 @@ public class CppConfiguration extends BuildConfiguration.Fragment { * down the dependency tree. */ public boolean isDataConfigurationForLipoOptimization() { - return cppOptions.isDataConfigurationForLipoOptimization(); + // If compiler is LLVM, then LIPO gets auto-converted to ThinLTO. + return cppOptions.isDataConfigurationForLipoOptimization() && !isLLVMCompiler(); } public boolean isLipoOptimizationOrInstrumentation() { |