diff options
| author | Fabio B <f-bro@mailbox.org> | 2018-04-13 09:43:10 +0200 |
|---|---|---|
| committer | Fabio B <f-bro@mailbox.org> | 2018-04-13 09:43:10 +0200 |
| commit | 35087fcb89d8d6ba8e9490e9aadeaf6987c55e34 (patch) | |
| tree | c16dbeaefedaf2c9ebcb5853a0877ba5be1d6a8b /src/bootstrap | |
| parent | 252a459d373f40512ed9137d59e4b6bea5d6aaee (diff) | |
| download | rust-35087fcb89d8d6ba8e9490e9aadeaf6987c55e34.tar.gz rust-35087fcb89d8d6ba8e9490e9aadeaf6987c55e34.zip | |
Remove -Z miri debugging option
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bin/rustc.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 3dd9b684059..b6ae824c376 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -247,9 +247,6 @@ fn main() { // When running miri tests, we need to generate MIR for all libraries if env::var("TEST_MIRI").ok().map_or(false, |val| val == "true") { cmd.arg("-Zalways-encode-mir"); - if stage != "0" { - cmd.arg("-Zmiri"); - } cmd.arg("-Zmir-emit-validate=1"); } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index c175d2c6901..aff48799526 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -875,7 +875,7 @@ impl Step for Compiletest { if build.config.rust_debuginfo_tests { flags.push("-g".to_string()); } - flags.push("-Zmiri -Zunstable-options".to_string()); + flags.push("-Zunstable-options".to_string()); flags.push(build.config.cmd.rustc_args().join(" ")); if let Some(linker) = build.linker(target) { |
