diff options
| author | Lzu Tao <taolzu@gmail.com> | 2019-06-12 19:04:35 +0000 |
|---|---|---|
| committer | Lzu Tao <taolzu@gmail.com> | 2019-06-12 19:04:43 +0000 |
| commit | 7c8644dc23679f28635da946803db9a879856460 (patch) | |
| tree | 2bc3d0d3141ab1d6acb77b70a3e8a41e5f70caa9 /src | |
| parent | 24ddd1615419be89828fb5628e3c14af86c08b01 (diff) | |
| download | rust-7c8644dc23679f28635da946803db9a879856460.tar.gz rust-7c8644dc23679f28635da946803db9a879856460.zip | |
Add an alias for x86_64-sun-solaris target tuple
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_target/spec/mod.rs | 18 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 844edbb946a..42ba49ba2b8 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -268,16 +268,16 @@ pub type LinkArgs = BTreeMap<LinkerFlavor, Vec<String>>; pub type TargetResult = Result<Target, String>; macro_rules! supported_targets { - ( $(($triple:expr, $module:ident),)+ ) => ( - $(mod $module;)* + ( $(($( $triple:literal, )+ $module:ident ),)+ ) => { + $(mod $module;)+ /// List of supported targets - const TARGETS: &[&str] = &[$($triple),*]; + const TARGETS: &[&str] = &[$($($triple),+),+]; fn load_specific(target: &str) -> Result<Target, LoadTargetError> { match target { $( - $triple => { + $($triple)|+ => { let mut t = $module::target() .map_err(LoadTargetError::Other)?; t.options.is_builtin = true; @@ -307,7 +307,7 @@ macro_rules! supported_targets { mod test_json_encode_decode { use serialize::json::ToJson; use super::Target; - $(use super::$module;)* + $(use super::$module;)+ $( #[test] @@ -322,9 +322,9 @@ macro_rules! supported_targets { assert_eq!(original, parsed); }); } - )* + )+ } - ) + }; } supported_targets! { @@ -426,7 +426,9 @@ supported_targets! { ("armv7r-none-eabi", armv7r_none_eabi), ("armv7r-none-eabihf", armv7r_none_eabihf), - ("x86_64-sun-solaris", x86_64_sun_solaris), + // `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons. + // (See <https://github.com/rust-lang/rust/issues/40531>.) + ("x86_64-sun-solaris", "x86_64-pc-solaris", x86_64_sun_solaris), ("sparcv9-sun-solaris", sparcv9_sun_solaris), ("x86_64-pc-windows-gnu", x86_64_pc_windows_gnu), diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 5efd51b65c1..b6e087c3844 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -118,6 +118,7 @@ static TARGETS: &[&str] = &[ "x86_64-pc-windows-msvc", "x86_64-rumprun-netbsd", "x86_64-sun-solaris", + "x86_64-pc-solaris", "x86_64-unknown-cloudabi", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu", |