diff options
| author | bors <bors@rust-lang.org> | 2017-07-17 03:03:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-17 03:03:19 +0000 |
| commit | 08652ec95721ea66facfda4626dd1ec543434ade (patch) | |
| tree | fb0394928fa6fd98e8dcb8f050254b9d35f77800 /src/rustllvm/RustWrapper.cpp | |
| parent | 56071f68795f91ee8b617b6a20fc22675b53eafc (diff) | |
| parent | 5f37110e5e1ae14a19aa7ee036f27e47e08ee73d (diff) | |
| download | rust-08652ec95721ea66facfda4626dd1ec543434ade.tar.gz rust-08652ec95721ea66facfda4626dd1ec543434ade.zip | |
Auto merge of #43258 - petrochenkov:cbabort, r=alexcrichton
Compile `compiler_builtins` with `abort` panic strategy
A workaround for https://github.com/rust-lang/rust/issues/43095
In case this causes unexpected consequences, I use a simpler workaround locally:
```diff
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -175,7 +175,9 @@ fn main() {
}
if let Ok(s) = env::var("RUSTC_CODEGEN_UNITS") {
- cmd.arg("-C").arg(format!("codegen-units={}", s));
+ if crate_name != "compiler_builtins" {
+ cmd.arg("-C").arg(format!("codegen-units={}", s));
+ }
}
// Emit save-analysis info.
```
r? @alexcrichton
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions