about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2021-02-16 21:34:28 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2021-02-20 17:19:30 -0500
commitb1a4bca3e6a03eb59d4ef748a32448226015a2f5 (patch)
treeacec313c3c7bb05b7b15e8a1043d2752d97c4e4c
parent7179be87899ff7730abccca598e987544132ca67 (diff)
Use the new name for `split-debuginfo`
-rw-r--r--src/bootstrap/builder.rs14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index a9099981e64..bbc216b9e6c 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");
             }
         }