about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2020-01-24 00:31:02 -0800
committerGitHub <noreply@github.com>2020-01-24 00:31:02 -0800
commit7f8a61d96c5a628ffb88304eb84a85140479ecad (patch)
tree3f0255955f4d43f524452b720ab33e6e64825836
parenta7e2ac41ed3538d2a664b927520c6cd32683f43f (diff)
parent1cbb5d849071970f7a4d19ce8f75becaac4ee0c2 (diff)
downloadrust-7f8a61d96c5a628ffb88304eb84a85140479ecad.tar.gz
rust-7f8a61d96c5a628ffb88304eb84a85140479ecad.zip
Rollup merge of #68500 - Mark-Simulacrum:fix-bootstrap-clearing, r=alexcrichton
Clear out std, not std tools

This was a typo that slipped in, and meant that we were still not properly
clearing out std.

This is basically #67760 but actually correct...
-rw-r--r--src/bootstrap/builder.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 00c8e72a8f6..d9c894aa9c6 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -874,7 +874,7 @@ impl<'a> Builder<'a> {
         //
         // Only clear out the directory if we're compiling std; otherwise, we
         // should let Cargo take care of things for us (via depdep info)
-        if !self.config.dry_run && mode == Mode::ToolStd && cmd == "build" {
+        if !self.config.dry_run && mode == Mode::Std && cmd == "build" {
             self.clear_if_dirty(&out_dir, &self.rustc(compiler));
         }