diff options
author | 2018-04-02 11:26:31 -0700 | |
---|---|---|
committer | 2018-04-02 11:27:44 -0700 | |
commit | fe7bb5ea10adae6a5b61681fc48927bb365c8a24 (patch) | |
tree | 736484804b8e7fdd32c8ed1242993bee3ec36855 /src/main/java/com/google/devtools/build | |
parent | 9bfbefc13f2b6ae9a86fd46a8470e3b4cd8efd1a (diff) |
Deduplicate the list of valid CPUs
RELNOTES: None.
PiperOrigin-RevId: 191320863
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java index a57dd7312b..c1429e1985 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java @@ -46,6 +46,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; @@ -360,9 +361,12 @@ public class CrosstoolConfigurationLoader { } if (selectedIdentifier == null) { + HashSet<String> seenCpus = new HashSet<>(); StringBuilder cpuBuilder = new StringBuilder(); for (CrosstoolConfig.DefaultCpuToolchain selector : release.getDefaultToolchainList()) { - cpuBuilder.append(" ").append(selector.getCpu()).append(",\n"); + if (seenCpus.add(selector.getCpu())) { + cpuBuilder.append(" ").append(selector.getCpu()).append(",\n"); + } } throw new InvalidConfigurationException( "No default_toolchain found for cpu '" |