From f0816947c9e7b975285b178b417b2601744af270 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Thu, 15 Aug 2019 06:55:13 +0200
Subject: [PATCH] Always pass freebsd11 - otherwise cross-compiling to FreeBSD
fails
---
build.rs | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/build.rs b/build.rs
index 339eb195..efc95b66 100644
--- a/build.rs
+++ b/build.rs
@@ -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() {
--
GitLab