Skip to content

Commit 49aa5a2

Browse files
committed
Revert "Invoke backtrace-rs buildscript in std buildscript"
This reverts commit 9367727 because it caused issues for projects building the standard library with non-cargo build systems.
1 parent 57ef889 commit 49aa5a2

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -5082,7 +5082,6 @@ version = "0.0.0"
50825082
dependencies = [
50835083
"addr2line",
50845084
"alloc",
5085-
"cc",
50865085
"cfg-if",
50875086
"compiler_builtins",
50885087
"core",

library/std/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ object = { version = "0.32.0", default-features = false, optional = true, featur
3636
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
3737
rand_xorshift = "0.3.0"
3838

39-
[build-dependencies]
40-
# Dependency of the `backtrace` crate's build script
41-
cc = "1.0.67"
42-
4339
[target.'cfg(any(all(target_family = "wasm", target_os = "unknown"), target_os = "xous", all(target_vendor = "fortanix", target_env = "sgx")))'.dependencies]
4440
dlmalloc = { version = "0.2.4", features = ['rustc-dep-of-std'] }
4541

library/std/build.rs

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
use std::env;
22

3-
// backtrace-rs requires a feature check on Android targets, so
4-
// we need to run its build.rs as well.
5-
#[allow(unused_extern_crates)]
6-
#[path = "../backtrace/build.rs"]
7-
mod backtrace_build_rs;
8-
93
fn main() {
104
println!("cargo:rerun-if-changed=build.rs");
115
let target = env::var("TARGET").expect("TARGET was not set");
@@ -65,6 +59,4 @@ fn main() {
6559
}
6660
println!("cargo:rustc-env=STD_ENV_ARCH={}", env::var("CARGO_CFG_TARGET_ARCH").unwrap());
6761
println!("cargo:rustc-cfg=backtrace_in_libstd");
68-
69-
backtrace_build_rs::main();
7062
}

0 commit comments

Comments
 (0)