Skip to content

Commit f073462

Browse files
committed
bootstrap: Don't apply -Ztls-model=initial-exec to deps of proc-macros
1 parent f4d215e commit f073462

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Diff for: src/bootstrap/src/bin/rustc.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ use shared_helpers::{
2828
#[path = "../utils/shared_helpers.rs"]
2929
mod shared_helpers;
3030

31+
#[path = "../utils/proc_macro_deps.rs"]
32+
mod proc_macro_deps;
33+
3134
fn main() {
3235
let orig_args = env::args_os().skip(1).collect::<Vec<_>>();
3336
let mut args = orig_args.clone();
@@ -167,7 +170,7 @@ fn main() {
167170
// issue https://github.com/rust-lang/rust/issues/100530
168171
if env::var("RUSTC_TLS_MODEL_INITIAL_EXEC").is_ok()
169172
&& crate_type != Some("proc-macro")
170-
&& !matches!(crate_name, Some("proc_macro2" | "quote" | "syn" | "synstructure"))
173+
&& proc_macro_deps::CRATES.binary_search(&crate_name.unwrap_or_default()).is_err()
171174
{
172175
cmd.arg("-Ztls-model=initial-exec");
173176
}

0 commit comments

Comments
 (0)