Compile compiler_builtins with abort panic strategy
#43258
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@bors: r+ Thanks! |
|
📌 Commit 5f37110 has been approved by |
bors
added a commit
that referenced
this pull request
Jul 16, 2017
Compile `compiler_builtins` with `abort` panic strategy A workaround for #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
|
💔 Test failed - status-travis |
|
|
I'm going to retry this since it feels possibly spurious, though it also doesn't seem that way. Shouldn't be related to this though... @bors retry |
Mark-Simulacrum
added
S-waiting-on-review
bors
added a commit
that referenced
this pull request
Jul 17, 2017
Compile `compiler_builtins` with `abort` panic strategy A workaround for #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
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A workaround for #43095
In case this causes unexpected consequences, I use a simpler workaround locally:
r? @alexcrichton