Skip to content
Snippets Groups Projects
Commit f0816947 authored by gnzlbg's avatar gnzlbg
Browse files

Always pass freebsd11 - otherwise cross-compiling to FreeBSD fails

parent eb9f523e
No related branches found
No related tags found
No related merge requests found
......@@ -21,17 +21,11 @@ fn main() {
//
// On CI, we detect the actual FreeBSD version and match its ABI exactly,
// running tests to ensure that the ABI is correct.
#[cfg(target_os = "freebsd")]
match which_freebsd() {
Some(11) if libc_ci => println!("cargo:rustc-cfg=freebsd11"),
Some(12) if libc_ci => println!("cargo:rustc-cfg=freebsd12"),
Some(13) if libc_ci => println!("cargo:rustc-cfg=freebsd13"),
Some(_) => println!("cargo:rustc-cfg=freebsd11"),
None =>
/* not FreeBSD - nothing to do here */
{
()
}
Some(_) | None => println!("cargo:rustc-cfg=freebsd11"),
}
// Rust >= 1.15 supports private module use:
......@@ -94,7 +88,6 @@ fn rustc_minor_version() -> Option<u32> {
otry!(pieces.next()).parse().ok()
}
#[cfg(target_os = "freebsd")]
fn which_freebsd() -> Option<i32> {
let output = std::process::Command::new("freebsd-version").output().ok();
if output.is_none() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment