From 89cf3cbee0fbe4c2d515e5303c79093ad9e3eb04 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Thu, 20 Feb 2020 12:12:40 +0100 Subject: [PATCH 1/2] Define HAVE_KERN_PROC on FreeBSD to fix rust-lang/rust#54434 For the same reason define HAVE_KERN_PROC_ARGS on NetBSD. This depends on having [1] available in libbacktrace. [1] https://github.com/ianlancetaylor/libbacktrace/commit/0f06cda953cc4e26f38751c5b9f15ae8dfa5ff2d --- crates/backtrace-sys/build.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/backtrace-sys/build.rs b/crates/backtrace-sys/build.rs index 98ab6be05..32d40802c 100644 --- a/crates/backtrace-sys/build.rs +++ b/crates/backtrace-sys/build.rs @@ -61,6 +61,12 @@ fn main() { File::create(out_dir.join("config.h")).unwrap(); if target.contains("android") { maybe_enable_dl_iterate_phdr_android(&mut build); + } else if target.contains("freebsd") { + build.define("HAVE_DL_ITERATE_PHDR", "1"); + build.define("HAVE_KERN_PROC", "1"); + } else if target.contains("netbsd") { + build.define("HAVE_DL_ITERATE_PHDR", "1"); + build.define("HAVE_KERN_PROC_ARGS", "1"); } else if !target.contains("apple-ios") && !target.contains("solaris") && !target.contains("redox") From f90563e4795b08e157ef9f5d2d8891b165e2a0f7 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Thu, 20 Feb 2020 13:33:30 +0100 Subject: [PATCH 2/2] Add dragonfly too --- crates/backtrace-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/backtrace-sys/build.rs b/crates/backtrace-sys/build.rs index 32d40802c..df9396567 100644 --- a/crates/backtrace-sys/build.rs +++ b/crates/backtrace-sys/build.rs @@ -61,7 +61,7 @@ fn main() { File::create(out_dir.join("config.h")).unwrap(); if target.contains("android") { maybe_enable_dl_iterate_phdr_android(&mut build); - } else if target.contains("freebsd") { + } else if target.contains("dragonfly") || target.contains("freebsd") { build.define("HAVE_DL_ITERATE_PHDR", "1"); build.define("HAVE_KERN_PROC", "1"); } else if target.contains("netbsd") {