From 8e58398f5781346c134e488952091aa8145dc470 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 1 Jul 2022 19:34:52 +1000 Subject: [PATCH] Fix windows target detection for abi `gnullvm` Signed-off-by: Jiahao XU --- src/target.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/target.rs b/src/target.rs index 6fe51f0e..cfe042a0 100644 --- a/src/target.rs +++ b/src/target.rs @@ -220,9 +220,10 @@ mod windows { use guess_host_triple::guess_host_triple; pub(super) fn detect_alternative_targets(target: &str) -> Option { - target - .contains("gnu") - .then(|| target.replace("gnu", "msvc")) + let (prefix, abi) = target.rsplit_once('-').expect("Invalid target triple"); + + // detect abi in ["gnu", "gnullvm", ...] + (abi != "msvc").then(|| format!("{prefix}-msvc")) } pub(super) fn detect_targets_windows() -> Vec {