From 9390285763c059642db31a43915cd4239c17c4b5 Mon Sep 17 00:00:00 2001 From: "Jonathan A. Kollasch" Date: Sat, 6 Aug 2016 09:01:26 -0500 Subject: [PATCH 1/2] sort lookup table of target to prefix mappings --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ea2cc9b..d464882 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -675,19 +675,19 @@ impl Config { "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"), "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), "arm-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), - "armv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), "arm-unknown-linux-musleabi" => Some("arm-linux-musleabi"), "arm-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), + "armv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), "armv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), + "i686-pc-windows-gnu" => Some("i686-w64-mingw32"), + "mips-unknown-linux-gnu" => Some("mips-linux-gnu"), + "mipsel-unknown-linux-gnu" => Some("mipsel-linux-gnu"), "powerpc-unknown-linux-gnu" => Some("powerpc-linux-gnu"), "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"), "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"), - "mips-unknown-linux-gnu" => Some("mips-linux-gnu"), - "mipsel-unknown-linux-gnu" => Some("mipsel-linux-gnu"), - "i686-pc-windows-gnu" => Some("i686-w64-mingw32"), "x86_64-pc-windows-gnu" => Some("x86_64-w64-mingw32"), - "x86_64-unknown-linux-musl" => Some("musl"), "x86_64-rumprun-netbsd" => Some("x86_64-rumprun-netbsd"), + "x86_64-unknown-linux-musl" => Some("musl"), _ => None, }; match prefix { From e92cf36195f019ca0cc872cb38aa5152b33ab223 Mon Sep 17 00:00:00 2001 From: "Jonathan A. Kollasch" Date: Sat, 6 Aug 2016 10:07:40 -0500 Subject: [PATCH 2/2] Add some NetBSD target to toolchain prefix mappings - arm-unknown-netbsdelf-eabi - armv6-unknown-netbsdelf-eabihf - armv7-unknown-netbsdelf-eabihf - i686-unknown-netbsdelf - powerpc-unknown-netbsd - x86_64-unknown-netbsd --- src/lib.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index d464882..f88187f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -677,17 +677,23 @@ impl Config { "arm-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), "arm-unknown-linux-musleabi" => Some("arm-linux-musleabi"), "arm-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), + "arm-unknown-netbsdelf-eabi" => Some("arm--netbsdelf-eabi"), + "armv6-unknown-netbsdelf-eabihf" => Some("armv6--netbsdelf-eabihf"), "armv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), "armv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), + "armv7-unknown-netbsdelf-eabihf" => Some("armv7--netbsdelf-eabihf"), "i686-pc-windows-gnu" => Some("i686-w64-mingw32"), + "i686-unknown-netbsdelf" => Some("i486--netbsdelf"), "mips-unknown-linux-gnu" => Some("mips-linux-gnu"), "mipsel-unknown-linux-gnu" => Some("mipsel-linux-gnu"), "powerpc-unknown-linux-gnu" => Some("powerpc-linux-gnu"), + "powerpc-unknown-netbsd" => Some("powerpc--netbsd"), "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"), "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"), "x86_64-pc-windows-gnu" => Some("x86_64-w64-mingw32"), "x86_64-rumprun-netbsd" => Some("x86_64-rumprun-netbsd"), "x86_64-unknown-linux-musl" => Some("musl"), + "x86_64-unknown-netbsd" => Some("x86_64--netbsd"), _ => None, }; match prefix {