Skip to content

Commit

Permalink
Auto merge of rust-lang#116318 - pitaj:android-backtrace-build, r=wor…
Browse files Browse the repository at this point in the history
…kingjubilee

Invoke `backtrace-rs` buildscript in `std` buildscript

Based on rust-lang#99883 by `@Arc-blroth`
Depends on rust-lang/backtrace-rs#556 and rust-lang/cc-rs#705
  • Loading branch information
bors committed Oct 7, 2023
2 parents 93b6a36 + 9367727 commit 4ea5190
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5013,6 +5013,7 @@ version = "0.0.0"
dependencies = [
"addr2line",
"alloc",
"cc",
"cfg-if",
"compiler_builtins",
"core",
Expand Down
4 changes: 4 additions & 0 deletions library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ object = { version = "0.32.0", default-features = false, optional = true, featur
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
rand_xorshift = "0.3.0"

[build-dependencies]
# Dependency of the `backtrace` crate's build script
cc = "1.0.67"

[target.'cfg(any(all(target_family = "wasm", target_os = "unknown"), target_os = "xous", all(target_vendor = "fortanix", target_env = "sgx")))'.dependencies]
dlmalloc = { version = "0.2.4", features = ['rustc-dep-of-std'] }

Expand Down
8 changes: 8 additions & 0 deletions library/std/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
use std::env;

// backtrace-rs requires a feature check on Android targets, so
// we need to run its build.rs as well.
#[allow(unused_extern_crates)]
#[path = "../backtrace/build.rs"]
mod backtrace_build_rs;

fn main() {
println!("cargo:rerun-if-changed=build.rs");
let target = env::var("TARGET").expect("TARGET was not set");
Expand Down Expand Up @@ -58,4 +64,6 @@ fn main() {
}
println!("cargo:rustc-env=STD_ENV_ARCH={}", env::var("CARGO_CFG_TARGET_ARCH").unwrap());
println!("cargo:rustc-cfg=backtrace_in_libstd");

backtrace_build_rs::main();
}

0 comments on commit 4ea5190

Please sign in to comment.