From 8ebe400e641e91aa8f1413edb93ee6eb3adabad8 Mon Sep 17 00:00:00 2001 From: Tomoaki Kawada Date: Wed, 6 Jul 2022 14:14:21 +0900 Subject: [PATCH] kmc-solid: Apply cross-build prefix by `prefix_for_target` instead of special-casing in `get_base_compiler` --- src/lib.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 21185a7f..c486e6be 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2340,10 +2340,6 @@ impl Build { } else { "wr-cc".to_string() } - } else if target.starts_with("armv7a-kmc-solid_") { - format!("arm-kmc-eabi-{}", gnu) - } else if target.starts_with("aarch64-kmc-solid_") { - format!("aarch64-kmc-elf-{}", gnu) } else if self.get_host()? != target { let prefix = self.prefix_for_target(&target); match prefix { @@ -2669,6 +2665,7 @@ impl Build { "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"), "aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"), "aarch64-unknown-netbsd" => Some("aarch64--netbsd"), + "aarch64-kmc-solid_asp3" => Some("aarch64-kmc-elf"), "arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), "armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), "armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"), @@ -2684,6 +2681,7 @@ impl Build { "armv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), "armv7neon-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), "armv7neon-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), + "armv7a-kmc-solid_asp3-eabi" | "armv7a-kmc-solid_asp3-eabihf" => Some("arm-kmc-eabi"), "thumbv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"), "thumbv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"), "thumbv7neon-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),