From b1a4bca3e6a03eb59d4ef748a32448226015a2f5 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Tue, 16 Feb 2021 21:34:28 -0500 Subject: [PATCH] Use the new name for `split-debuginfo` --- src/bootstrap/builder.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index a9099981e644..bbc216b9e6c4 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1160,18 +1160,10 @@ impl<'a> Builder<'a> { // itself, we skip it by default since we know it's safe to do so in that case. // See https://github.com/rust-lang/rust/issues/79361 for more info on this flag. if target.contains("apple") { - if stage == 0 { - if self.config.rust_run_dsymutil { - rustflags.arg("-Zrun-dsymutil=yes"); - } else { - rustflags.arg("-Zrun-dsymutil=no"); - } + if self.config.rust_run_dsymutil { + rustflags.arg("-Csplit-debuginfo=packed"); } else { - if self.config.rust_run_dsymutil { - rustflags.arg("-Csplit-debuginfo=packed"); - } else { - rustflags.arg("-Csplit-debuginfo=unpacked"); - } + rustflags.arg("-Csplit-debuginfo=unpacked"); } }