From 494273ae59a776f8bf771778232290c6fa3e3116 Mon Sep 17 00:00:00 2001 From: Florian Bartels Date: Fri, 28 Oct 2022 11:28:56 +0200 Subject: [PATCH] Fix QNX/nto support of 7.1 --- src/lib.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4d688d1..6825e7a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1123,15 +1123,17 @@ fn default_cfg(target: &str) -> Vec<(String, Option)> { ("vxworks", "unix", "") } else if target.contains("haiku") { ("haiku", "unix", "") - } else if target.contains("qnx") { - // Set an environment string if provided, empty str otherwise - let before_env = "-qnx-"; - let env = target + } else if target.contains("nto-qnx") { + let before_env = "nto-qnx"; + let version = target .rfind(before_env) .map(|i| &target[i + before_env.len()..]) - .or(Some("")) .unwrap(); - ("qnx", "unix", env) + let env = match version { + "7.1.0" => "nto71", + _ => panic!("Uknown version"), + }; + ("nto", "unix", env) } else { panic!("unknown os/family: {}", target) };