From cd5446d14a0df79a17e7673c309fbe577afe3c41 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Sat, 12 Aug 2023 13:00:05 -0600
Subject: [PATCH] Invoke `backtrace-rs` buildscript in `std` buildscript

Based on #99883 by @Arc-blroth
Depends on rust-lang/backtrace-rs#556 and rust-lang/cc-rs#705
---
 Cargo.lock             | 1 +
 library/std/Cargo.toml | 2 ++
 library/std/build.rs   | 8 ++++++++
 3 files changed, 11 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index f0a3553da2b4a..2194954f8e47e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4990,6 +4990,7 @@ 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 965132bdedb91..dda9901def04e 100644
--- a/library/std/Cargo.toml
+++ b/library/std/Cargo.toml
@@ -35,6 +35,8 @@ object = { version = "0.32.0", default-features = false, optional = true, featur
 [dev-dependencies]
 rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
 rand_xorshift = "0.3.0"
+# 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 36516978b7a09..164bca7c43665 100644
--- a/library/std/build.rs
+++ b/library/std/build.rs
@@ -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");
@@ -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();
 }