diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java index e5ec2563a9..3369dff17d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java @@ -138,9 +138,9 @@ public final class CcToolchainRule implements RuleDefinition { LabelLateBoundDefault.fromTargetConfiguration( CppConfiguration.class, null, - // TODO(b/69547565): Remove call to isLLVMOptimizedFdo + // TODO(b/69547565): Remove call to shouldIncludeZipperInToolchain (rule, attributes, cppConfig) -> - cppConfig.isLLVMOptimizedFdo() ? zipper : null))) + cppConfig.shouldIncludeZipperInToolchain() ? zipper : null))) .add(attr(":libc_top", LABEL).value(LIBC_TOP)) .add(attr(":fdo_optimize", LABEL).singleArtifact().value(FDO_OPTIMIZE_LABEL)) .add( 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 19adeb661b..e4aea90680 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 @@ -892,12 +892,12 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { */ // TODO(b/64384912): Remove in favor of overload with isLLVMCompiler. @Deprecated - public boolean isLLVMOptimizedFdo() { - return cppOptions.getFdoOptimize() != null - && (CppFileTypes.LLVM_PROFILE.matches(cppOptions.getFdoOptimize()) - || CppFileTypes.LLVM_PROFILE_RAW.matches(cppOptions.getFdoOptimize()) - || (isLLVMCompiler() - && cppOptions.getFdoOptimize().endsWith(".zip"))); + public boolean shouldIncludeZipperInToolchain() { + return (cppOptions.getFdoOptimize() != null + && (CppFileTypes.LLVM_PROFILE.matches(cppOptions.getFdoOptimize()) + || CppFileTypes.LLVM_PROFILE_RAW.matches(cppOptions.getFdoOptimize()) + || (isLLVMCompiler() && cppOptions.getFdoOptimize().endsWith(".zip")))) + || (cppOptions.getFdoProfileLabel() != null); } /** Returns true if LIPO optimization is implied by the flags of this build. */ |