diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java | 72 |
1 files changed, 35 insertions, 37 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 139065790d..a8369951dd 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 @@ -64,42 +64,40 @@ public final class CcToolchainRule implements RuleDefinition { .add(attr("cpu", STRING).mandatory()) .add(attr("compiler", STRING)) .add(attr("libc", STRING)) - .add(attr("all_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE) - .mandatory()) - .add(attr("compiler_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE) - .mandatory()) - .add(attr("strip_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE) - .mandatory()) - .add(attr("objcopy_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE) - .mandatory()) - .add(attr("linker_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE) - .mandatory()) - .add(attr("dwp_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE) - .mandatory()) - .add(attr("coverage_files", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE)) - .add(attr("static_runtime_libs", LABEL_LIST) - .legacyAllowAnyFileType() - .mandatory()) - .add(attr("dynamic_runtime_libs", LABEL_LIST) - .legacyAllowAnyFileType() - .mandatory()) - .add(attr("module_map", LABEL) - .legacyAllowAnyFileType() - .cfg(HostTransition.INSTANCE)) + .add( + attr("all_files", LABEL) + .legacyAllowAnyFileType() + .cfg(HostTransition.INSTANCE) + .mandatory()) + .add( + attr("compiler_files", LABEL) + .legacyAllowAnyFileType() + .cfg(HostTransition.INSTANCE) + .mandatory()) + .add( + attr("strip_files", LABEL) + .legacyAllowAnyFileType() + .cfg(HostTransition.INSTANCE) + .mandatory()) + .add( + attr("objcopy_files", LABEL) + .legacyAllowAnyFileType() + .cfg(HostTransition.INSTANCE) + .mandatory()) + .add( + attr("linker_files", LABEL) + .legacyAllowAnyFileType() + .cfg(HostTransition.INSTANCE) + .mandatory()) + .add( + attr("dwp_files", LABEL) + .legacyAllowAnyFileType() + .cfg(HostTransition.INSTANCE) + .mandatory()) + .add(attr("coverage_files", LABEL).legacyAllowAnyFileType().cfg(HostTransition.INSTANCE)) + .add(attr("static_runtime_libs", LABEL_LIST).legacyAllowAnyFileType().mandatory()) + .add(attr("dynamic_runtime_libs", LABEL_LIST).legacyAllowAnyFileType().mandatory()) + .add(attr("module_map", LABEL).legacyAllowAnyFileType().cfg(HostTransition.INSTANCE)) .add(attr("supports_param_files", BOOLEAN).value(true)) .add(attr("supports_header_parsing", BOOLEAN).value(false)) .add( @@ -128,7 +126,7 @@ public final class CcToolchainRule implements RuleDefinition { cppConfig.isLLVMOptimizedFdo() ? zipper : null))) .add(attr(":libc_top", LABEL).value(LIBC_TOP)) .add( - attr(":lipo_context_collector", LABEL) + attr(TransitiveLipoInfoProvider.LIPO_CONTEXT_COLLECTOR, LABEL) .cfg(LipoContextCollectorTransition.INSTANCE) .value(CppRuleClasses.LIPO_CONTEXT_COLLECTOR) .skipPrereqValidatorCheck()) |