From f6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec Mon Sep 17 00:00:00 2001 From: David Koloski Date: Tue, 3 Jan 2023 15:59:21 -0500 Subject: Add vendor to Fuchsia's target triple Historically, Rust's Fuchsia targets have been labeled x86_64-fuchsia and aarch64-fuchsia. However, they should technically contain vendor information. This CL changes Fuchsia's target triples to include the "unknown" vendor since Clang now does normalization and handles all triple spellings. This was previously attempted in #90510, which was closed due to inactivity. --- src/ci/docker/scripts/fuchsia-test-runner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ci/docker/scripts') diff --git a/src/ci/docker/scripts/fuchsia-test-runner.py b/src/ci/docker/scripts/fuchsia-test-runner.py index 3e86339859d..c8d1ff9aefb 100755 --- a/src/ci/docker/scripts/fuchsia-test-runner.py +++ b/src/ci/docker/scripts/fuchsia-test-runner.py @@ -4,7 +4,7 @@ The Rust toolchain test runner for Fuchsia. For instructions on running the compiler test suite, see -https://doc.rust-lang.org/stable/rustc/platform-support/fuchsia.html#aarch64-fuchsia-and-x86_64-fuchsia +https://doc.rust-lang.org/stable/rustc/platform-support/fuchsia.html#aarch64-unknown-fuchsia-and-x86_64-unknown-fuchsia """ import argparse @@ -110,9 +110,9 @@ class TestEnvironment: def rustlib_dir(self): if self.target_arch == "x64": - return "x86_64-fuchsia" + return "x86_64-unknown-fuchsia" if self.target_arch == "arm64": - return "aarch64-fuchsia" + return "aarch64-unknown-fuchsia" raise Exception(f"Unrecognized target architecture {self.target_arch}") def libs_dir(self): -- cgit 1.4.1-3-g733a5