about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-02-23 07:19:41 +0000
committerbors <bors@rust-lang.org>2021-02-23 07:19:41 +0000
commitcd64446196a02e593c5f50b8d863161306da43f7 (patch)
tree6de1147cc53c807e789794cb944ab9b3cdb4c1e8 /src/bootstrap
parenta4e595db8f12f9ee926256745d757004b850703f (diff)
parentb1a4bca3e6a03eb59d4ef748a32448226015a2f5 (diff)
downloadrust-cd64446196a02e593c5f50b8d863161306da43f7.tar.gz
rust-cd64446196a02e593c5f50b8d863161306da43f7.zip
Auto merge of #82076 - jyn514:update-bootstrap, r=Mark-Simulacrum
Update the bootstrap compiler

This updates the bootstrap compiler, notably leaving out a change to enable semicolon in macro expressions lint, because stdarch still depends on the old behavior.
Diffstat (limited to 'src/bootstrap')
-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 08f10fbd794..61554a316d0 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1161,18 +1161,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");
             }
         }