diff options
| author | bors <bors@rust-lang.org> | 2023-10-13 21:38:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-13 21:38:50 +0000 |
| commit | fcab24817c72ffbd6ffb66d92b7ddc0d3ee4d2f0 (patch) | |
| tree | b22722739fa98ee1014828e87aec5631b9b41809 | |
| parent | 09eff4488902242b8a4a86697d74ad4166ee9e7e (diff) | |
| parent | 49aa5a23ca6509b5693cb01b244048a427d1a874 (diff) | |
| download | rust-fcab24817c72ffbd6ffb66d92b7ddc0d3ee4d2f0.tar.gz rust-fcab24817c72ffbd6ffb66d92b7ddc0d3ee4d2f0.zip | |
Auto merge of #116705 - pitaj:android-revert, r=workingjubilee
Revert "Invoke `backtrace-rs` buildscript in `std` buildscript" This reverts commit 93677276bc495e78f74536385a16201d465fd523 because it caused issues for projects building the standard library with non-cargo build systems. See https://github.com/rust-lang/rust/pull/116318#issuecomment-1761977900 r? workingjubilee
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 4 | ||||
| -rw-r--r-- | library/std/build.rs | 8 |
3 files changed, 0 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1f2a918d463..8bd9b605ddf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5082,7 +5082,6 @@ version = "0.0.0" dependencies = [ "addr2line", "alloc", - "cc", "cfg-if", "compiler_builtins", "core", diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index feb6274d029..965132bdedb 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -36,10 +36,6 @@ 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'] } diff --git a/library/std/build.rs b/library/std/build.rs index 49354d5a58c..046ac488b1f 100644 --- a/library/std/build.rs +++ b/library/std/build.rs @@ -1,11 +1,5 @@ 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"); @@ -65,6 +59,4 @@ 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(); } |