diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java | 14 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java index 656c8dfc84..3982e688f5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java @@ -14,13 +14,16 @@ package com.google.devtools.build.lib.rules.apple.cpp; import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.analysis.AnalysisUtils; import com.google.devtools.build.lib.analysis.RuleContext; +import com.google.devtools.build.lib.collect.nestedset.NestedSet; +import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.apple.DottedVersion; import com.google.devtools.build.lib.rules.apple.Platform; import com.google.devtools.build.lib.rules.cpp.CcToolchain; - import java.util.Map; /** @@ -68,4 +71,13 @@ public class AppleCcToolchain extends CcToolchain { AppleToolchain.platformDeveloperFrameworkDir(appleConfiguration)) .build(); } + + @Override + protected NestedSet<Artifact> fullInputsForLink( + RuleContext ruleContext, NestedSet<Artifact> link) { + return NestedSetBuilder.<Artifact>stableOrder() + .addTransitive(link) + .addTransitive(AnalysisUtils.getMiddlemanFor(ruleContext, ":libc_top")) + .build(); + } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD index cbfb7f3906..a0177e65b5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD @@ -10,7 +10,9 @@ java_library( srcs = glob(["*.java"]), deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/protobuf:xcodegen_java_proto", |