Skip to content

Commit 73490b9

Browse files
committed
kmc-solid: Apply cross-build prefix by prefix_for_target instead of special-casing in get_base_compiler
1 parent f2e1b1c commit 73490b9

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/lib.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -2252,10 +2252,6 @@ impl Build {
22522252
} else {
22532253
"wr-cc".to_string()
22542254
}
2255-
} else if target.starts_with("armv7a-kmc-solid_") {
2256-
format!("arm-kmc-eabi-{}", gnu)
2257-
} else if target.starts_with("aarch64-kmc-solid_") {
2258-
format!("aarch64-kmc-elf-{}", gnu)
22592255
} else if self.get_host()? != target {
22602256
let prefix = self.prefix_for_target(&target);
22612257
match prefix {
@@ -2558,6 +2554,7 @@ impl Build {
25582554
"aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
25592555
"aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
25602556
"aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
2557+
"aarch64-kmc-solid_asp3" => Some("aarch64-kmc-elf"),
25612558
"arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
25622559
"armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
25632560
"armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
@@ -2573,6 +2570,7 @@ impl Build {
25732570
"armv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
25742571
"armv7neon-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),
25752572
"armv7neon-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
2573+
"armv7a-kmc-solid_asp3-eabi" | "armv7a-kmc-solid_asp3-eabihf" => Some("arm-kmc-eabi"),
25762574
"thumbv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),
25772575
"thumbv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
25782576
"thumbv7neon-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),

0 commit comments

Comments
 (0)