From b53c52b3c6e6466d8bf143e19c2a6a82cb960515 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 Apr 2020 12:21:05 -0700 Subject: [PATCH 1/3] Fix an off-by-one error in backtrace-sys --- crates/backtrace-sys/src/libbacktrace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/backtrace-sys/src/libbacktrace b/crates/backtrace-sys/src/libbacktrace index d27b870a4..5c88e094a 160000 --- a/crates/backtrace-sys/src/libbacktrace +++ b/crates/backtrace-sys/src/libbacktrace @@ -1 +1 @@ -Subproject commit d27b870a4adc8c47989f16de9da8c4aff4ae9d72 +Subproject commit 5c88e094a691bb803d4bba342403a10459abad9e From a6eb60fbefa79a2387290e5331610733a70752f1 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 Apr 2020 12:21:29 -0700 Subject: [PATCH 2/3] Only explicitly configure debuginfo in rustc-dep-of-std --- crates/backtrace-sys/build.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/backtrace-sys/build.rs b/crates/backtrace-sys/build.rs index 776a3be91..79f75ca94 100644 --- a/crates/backtrace-sys/build.rs +++ b/crates/backtrace-sys/build.rs @@ -91,9 +91,11 @@ fn main() { // When we're built as part of the Rust compiler, this is used to enable // debug information in libbacktrace itself. - let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or_default() == "true" - || env::var("RUSTC_DEBUGINFO_LINES").unwrap_or_default() == "true"; - build.debug(any_debug); + if cfg!(feature = "rustc-dep-of-std") { + let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or_default() == "true" + || env::var("RUSTC_DEBUGINFO_LINES").unwrap_or_default() == "true"; + build.debug(any_debug); + } let syms = [ "backtrace_full", From c8067c6e091236a8e77a28c8f8dc9bb02d0f2dcb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 Apr 2020 12:33:40 -0700 Subject: [PATCH 3/3] Bump backtrace-sys to 0.1.36 --- crates/backtrace-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/backtrace-sys/Cargo.toml b/crates/backtrace-sys/Cargo.toml index 5c23f7375..b8bfa663b 100644 --- a/crates/backtrace-sys/Cargo.toml +++ b/crates/backtrace-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "backtrace-sys" -version = "0.1.35" +version = "0.1.36" authors = ["Alex Crichton "] build = "build.rs" license = "MIT/Apache-2.0"