Skip to content

Commit 8ebe400

Browse files
committed
kmc-solid: Apply cross-build prefix by prefix_for_target instead of special-casing in get_base_compiler
1 parent ad1f00d commit 8ebe400

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
@@ -2340,10 +2340,6 @@ impl Build {
23402340
} else {
23412341
"wr-cc".to_string()
23422342
}
2343-
} else if target.starts_with("armv7a-kmc-solid_") {
2344-
format!("arm-kmc-eabi-{}", gnu)
2345-
} else if target.starts_with("aarch64-kmc-solid_") {
2346-
format!("aarch64-kmc-elf-{}", gnu)
23472343
} else if self.get_host()? != target {
23482344
let prefix = self.prefix_for_target(&target);
23492345
match prefix {
@@ -2669,6 +2665,7 @@ impl Build {
26692665
"aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
26702666
"aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
26712667
"aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
2668+
"aarch64-kmc-solid_asp3" => Some("aarch64-kmc-elf"),
26722669
"arm-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
26732670
"armv4t-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
26742671
"armv5te-unknown-linux-gnueabi" => Some("arm-linux-gnueabi"),
@@ -2684,6 +2681,7 @@ impl Build {
26842681
"armv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
26852682
"armv7neon-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),
26862683
"armv7neon-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
2684+
"armv7a-kmc-solid_asp3-eabi" | "armv7a-kmc-solid_asp3-eabihf" => Some("arm-kmc-eabi"),
26872685
"thumbv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),
26882686
"thumbv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
26892687
"thumbv7neon-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),

0 commit comments

Comments
 (0)