diff options
author | cpeyser <cpeyser@google.com> | 2017-09-07 17:17:03 +0200 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-09-08 09:47:23 +0200 |
commit | fb829994988798e3d6663d66497f4614148ea79a (patch) | |
tree | 76dbe3bfd1c3ff44ea67750a8bc3c7bef890489b /src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java | |
parent | 4e79061f74a03dd9274f88ff42a7e2c0d6adae6c (diff) |
Rule classes cannot request duplicate toolchains.
PiperOrigin-RevId: 167861778
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java index 0f2a35238e..13e055b5aa 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java @@ -38,6 +38,7 @@ import com.google.devtools.build.skyframe.ValueOrException4; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; import javax.annotation.Nullable; /** @@ -53,7 +54,7 @@ public class ToolchainUtil { public static ToolchainContext createToolchainContext( Environment env, String targetDescription, - List<Label> requiredToolchains, + Set<Label> requiredToolchains, BuildConfiguration configuration) throws ToolchainContextException, InterruptedException { ImmutableBiMap<Label, Label> resolvedLabels = @@ -131,7 +132,7 @@ public class ToolchainUtil { @Nullable private static ImmutableBiMap<Label, Label> resolveToolchainLabels( - Environment env, List<Label> requiredToolchains, BuildConfiguration configuration) + Environment env, Set<Label> requiredToolchains, BuildConfiguration configuration) throws InterruptedException, ToolchainContextException { // If there are no required toolchains, bail out early. |