From b358c8fb167945153955e96c006d203e52e715f5 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 26 May 2024 20:45:16 +0200 Subject: [PATCH] build.rs: always use freebsd12 when rustc_dep_of_std is set --- build.rs | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/build.rs b/build.rs index ea053bd8b3d7a..6bcaafc791715 100644 --- a/build.rs +++ b/build.rs @@ -44,14 +44,21 @@ fn main() { // // On CI, we detect the actual FreeBSD version and match its ABI exactly, // running tests to ensure that the ABI is correct. - match which_freebsd() { - Some(10) if libc_ci => set_cfg("freebsd10"), - Some(11) if libc_ci => set_cfg("freebsd11"), - Some(12) if libc_ci || rustc_dep_of_std => set_cfg("freebsd12"), - Some(13) if libc_ci => set_cfg("freebsd13"), - Some(14) if libc_ci => set_cfg("freebsd14"), - Some(15) if libc_ci => set_cfg("freebsd15"), - Some(_) | None => set_cfg("freebsd11"), + let which_freebsd = if libc_ci { + which_freebsd().unwrap_or(11) + } else if rustc_dep_of_std { + 12 + } else { + 11 + }; + match which_freebsd { + x if x < 10 => panic!("FreeBSD older than 10 is not supported"), + 10 => set_cfg("freebsd10"), + 11 => set_cfg("freebsd11"), + 12 => set_cfg("freebsd12"), + 13 => set_cfg("freebsd13"), + 14 => set_cfg("freebsd14"), + _ => set_cfg("freebsd15"), } match emcc_version_code() {