commit 5e354eb0c94881f8334deda2e00f55b17ecd9929
author Tyler Mandry <tmandry@google.com> Fri May 10 00:12:00 2024 +0000
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 10 00:12:00 2024 +0000
tree baa819e5fc4314d8ea5c4b490f0f1c5af65bfddf
parent 2462709783cf9da231f8b78955279f8eaf7a3760

[rust] Remove non-canonical Fuchsia triples from toolchain

Fixed: 310271984
Change-Id: I613514049bb6d772325c80623cb05928d412e678
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1043317
Commit-Queue: Tyler Mandry <tmandry@google.com>
Reviewed-by: David Koloski <dkoloski@google.com>

recipes/rust_toolchain.resources/generate_config.py

diff --git a/recipes/rust_toolchain.resources/generate_config.py b/recipes/rust_toolchain.resources/generate_config.py
index ff793f5..cabf899 100644
--- a/recipes/rust_toolchain.resources/generate_config.py
+++ b/recipes/rust_toolchain.resources/generate_config.py
@@ -25,21 +25,15 @@
     "rustdoc",
 ]
 
-# TODO: http://fxbug.dev/310271984 - Remove the duplicated triples that are
-# missing "-unknown".
 FUCHSIA_TRIPLE_TO_GN_ARCH = {
-    "aarch64-fuchsia": "arm64",
     "aarch64-unknown-fuchsia": "arm64",
     "riscv64gc-unknown-fuchsia": "riscv64",
     "x86_64-unknown-fuchsia": "x64",
-    "x86_64-fuchsia": "x64",
 }
 FUCHSIA_TRIPLES = list(FUCHSIA_TRIPLE_TO_GN_ARCH.keys())
 FUCHSIA_RUNTIME_TARGETS = [
-    ("aarch64-fuchsia",),
     ("aarch64-unknown-fuchsia",),
     ("riscv64gc-unknown-fuchsia", "riscv64-unknown-fuchsia"),
-    ("x86_64-fuchsia",),
     ("x86_64-unknown-fuchsia",),
 ]