diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java index 0a46d7f9df..7c8791b697 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java @@ -405,12 +405,10 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { // Ensure that we build all the dependencies, otherwise users may get confused. NestedSetBuilder<Artifact> artifactsToForceBuilder = NestedSetBuilder.stableOrder(); CppConfiguration cppConfiguration = ruleContext.getFragment(CppConfiguration.class); - boolean isLipoCollector = cppConfiguration.isLipoContextCollector(); boolean processHeadersInDependencies = cppConfiguration.processHeadersInDependencies(); boolean usePic = CppHelper.usePicForDynamicLibraries(ruleContext, toolchain); artifactsToForceBuilder.addTransitive( - ccCompilationOutputs.getFilesToCompile( - isLipoCollector, processHeadersInDependencies, usePic)); + ccCompilationOutputs.getFilesToCompile(processHeadersInDependencies, usePic)); for (OutputGroupInfo dep : ruleContext.getPrerequisites( "deps", Mode.TARGET, OutputGroupInfo.SKYLARK_CONSTRUCTOR)) { @@ -423,12 +421,6 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { private static void warnAboutEmptyLibraries(RuleContext ruleContext, CcCompilationOutputs ccCompilationOutputs, boolean linkstaticAttribute) { - if (ruleContext.getFragment(CppConfiguration.class).isLipoContextCollector()) { - // Do not signal warnings in the lipo context collector configuration. These will be duly - // signaled in the target configuration, and there can be spurious warnings since targets in - // the LIPO context collector configuration do not compile anything. - return; - } if (ccCompilationOutputs.getObjectFiles(false).isEmpty() && ccCompilationOutputs.getObjectFiles(true).isEmpty()) { if (!linkstaticAttribute && appearsToHaveObjectFiles(ruleContext.attributes())) { |