Skip to content

Commit

Permalink
Revert "Invoke backtrace-rs buildscript in std buildscript"
Browse files Browse the repository at this point in the history
This reverts commit 9367727
because it caused issues for projects building the standard
library with non-cargo build systems.
  • Loading branch information
pitaj committed Oct 13, 2023
1 parent 57ef889 commit 49aa5a2
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5082,7 +5082,6 @@ version = "0.0.0"
dependencies = [
"addr2line",
"alloc",
"cc",
"cfg-if",
"compiler_builtins",
"core",
Expand Down
4 changes: 0 additions & 4 deletions library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }

Expand Down
8 changes: 0 additions & 8 deletions library/std/build.rs
Original file line number Diff line number Diff line change
@@ -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");
Expand Down Expand Up @@ -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();
}

0 comments on commit 49aa5a2

Please sign in to comment.