diff options
| author | bors <bors@rust-lang.org> | 2018-02-27 16:44:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-27 16:44:59 +0000 |
| commit | d3ae9a9e08edf12de0ed82af57ba2a56c26496ea (patch) | |
| tree | de72b3163b47f646b717f1f809d1315b9bf49da9 /src/bootstrap/builder.rs | |
| parent | 4d90ac38c0b61bb69470b61ea2cccea0df48d9e5 (diff) | |
| parent | 9853d20e4d054207c54b62e3fb700106652bcac9 (diff) | |
| download | rust-1.24.1.tar.gz rust-1.24.1.zip | |
Auto merge of #48445 - Mark-Simulacrum:stable-next, r=alexcrichton 1.24.1
[stable] 1.24.1 stable release The includes the following commits: - 6a600f827b632fb798b9ca52345130748fe86a30: Fixes #48251, unwinding through FFI no longer aborts - https://github.com/cuviper/rust/commit/b445a52ea322758fb7b60fab5f890ef8c0f8df9c: Fixes https://github.com/rust-lang/rust/issues/48308, fixing the error index generator - f8e00d0dc221564701ecdbb6dde57e0e9dd12900: Fixes https://github.com/rust-lang/rust/issues/48318 by emitting UTF-16 output on MSVC targets. - 2a0af8c448: Bumps the version number to 1.24.1. - 93220f0f45: Release notes - 6031718d8836f95bbfeddfaa63f1ee1d66e53f26: Cargo TLS warnings on Windows.
Diffstat (limited to 'src/bootstrap/builder.rs')
| -rw-r--r-- | src/bootstrap/builder.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 16de31406f8..ce30d1f4cec 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -484,8 +484,8 @@ impl<'a> Builder<'a> { } else { PathBuf::from("/path/to/nowhere/rustdoc/not/required") }) - .env("TEST_MIRI", self.config.test_miri.to_string()); - + .env("TEST_MIRI", self.config.test_miri.to_string()) + .env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir()); if let Some(n) = self.config.rust_codegen_units { cargo.env("RUSTC_CODEGEN_UNITS", n.to_string()); } |