diff options
| author | David Koloski <dkoloski@google.com> | 2023-01-03 15:59:21 -0500 |
|---|---|---|
| committer | David Koloski <dkoloski@google.com> | 2023-01-05 09:34:22 -0500 |
| commit | f6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec (patch) | |
| tree | 25028425a788eda2abeb0b948983599706040b38 /src/tools | |
| parent | e94fab69d020d75517cb55fafacb2d270ad6e0ac (diff) | |
| download | rust-f6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec.tar.gz rust-f6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec.zip | |
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.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 4 | ||||
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 0551e835bb0..21dad9eb74a 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -51,7 +51,7 @@ static TARGETS: &[&str] = &[ "aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-apple-ios-sim", - "aarch64-fuchsia", + "aarch64-unknown-fuchsia", "aarch64-linux-android", "aarch64-pc-windows-msvc", "aarch64-unknown-hermit", @@ -138,7 +138,7 @@ static TARGETS: &[&str] = &[ "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-fortanix-unknown-sgx", - "x86_64-fuchsia", + "x86_64-unknown-fuchsia", "x86_64-linux-android", "x86_64-pc-windows-gnu", "x86_64-pc-windows-msvc", diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index ccba313ee35..6c63b760ff6 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -11,7 +11,7 @@ mod tests; pub const ASAN_SUPPORTED_TARGETS: &[&str] = &[ "aarch64-apple-darwin", - "aarch64-fuchsia", + "aarch64-unknown-fuchsia", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-linux-androideabi", @@ -19,7 +19,7 @@ pub const ASAN_SUPPORTED_TARGETS: &[&str] = &[ "i686-linux-android", "i686-unknown-linux-gnu", "x86_64-apple-darwin", - "x86_64-fuchsia", + "x86_64-unknown-fuchsia", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu", @@ -28,12 +28,12 @@ pub const ASAN_SUPPORTED_TARGETS: &[&str] = &[ // FIXME(rcvalle): More targets are likely supported. pub const CFI_SUPPORTED_TARGETS: &[&str] = &[ "aarch64-apple-darwin", - "aarch64-fuchsia", + "aarch64-unknown-fuchsia", "aarch64-linux-android", "aarch64-unknown-freebsd", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", - "x86_64-fuchsia", + "x86_64-unknown-fuchsia", "x86_64-pc-solaris", "x86_64-unknown-freebsd", "x86_64-unknown-illumos", |