Add rustc_trans to x.py check #49890
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
rust-highfive
added
the
S-waiting-on-review
|
Ideally we'd only do this if we could skip the LLVM build, otherwise I don't know that it's all that useful. Could you remove the LLVM build from check (and maybe make sure you don't have a pre-built LLVM we could be linking to) and see if that works? |
Mark-Simulacrum
approved these changes
Apr 11, 2018
src/bootstrap/check.rs
Outdated
| _ => panic!("unknown backend: {}", self.backend), | ||
| } | ||
|
|
||
| let tmp_stamp = build.cargo_out(compiler, Mode::Librustc, target) |
There was a problem hiding this comment.
I think this might want to be different so we don't end up causing spurious rebuilds or lack thereof for non-check builds (cc @alexcrichton).
|
Hm it looks like there's a lot of code duplication here? Could that be shared between the normal build step and the check one? |
|
Hmm, I could pull the LLVM code out, which is identical. There are other scattered duplicated lines, but they might be too fragmented to make abstracting them worthwhile. |
|
Yes this instantiation looks fine. I'm not sure whether it interacts well with rebuilds, I think you'd need to test locally for that |
|
@alexcrichton: testing both |
|
@alexcrichton, @Mark-Simulacrum: Friendly triage ping, what is the status of this? |
|
@bors: r+ |
|
📌 Commit 7e2daf1 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 7e2daf1f1048fbe6515b2672636a6ee2adf74618 with merge 536d0631111fe60dbc6122242a427d3e59728ca9... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
1 similar comment
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
I can't tell if this is a problem with my change or not — the errors are coming from LLVM, but perhaps the refactoring broke something? What do you think @alexcrichton? |
|
I believe this is the mingw-check bot added recently which doesn't have the necessary prerequisites to build LLVM. When that's being executed I believe the intention was to entirely skip compilation of LLVM as it's not needed anyway if we're just running |
|
The difficulty I had was with the Is there a way around this, or might it be best to opt out of checking |
|
Yeah that script will need to be stubbed out in check mode. We don't actually link anything when checking so there's no need for LLVM to exist. |
varkor
force-pushed
the
xpy-check-rustc_trans
branch
from
7e2daf1 to
61b78e0
Compare
|
I've added a |
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
☔ The latest upstream changes (presumably #49972) made this pull request unmergeable. Please resolve the merge conflicts. |
This deduplicates the LLVM building functionality from compile.rs and check.rs.
varkor
force-pushed
the
xpy-check-rustc_trans
branch
from
7783ed1 to
84f52a7
Compare
|
@alexcrichton: looks like this is passing the mingw-check tests now :) |
varkor
commented
Apr 18, 2018
| let compiler = builder.compiler(0, builder.config.build); | ||
| let target = self.target; | ||
| let backend = self.backend; | ||
|
|
There was a problem hiding this comment.
Is it necessary to clear_if_dirty anything here (or add this to the clear_if_dirty sections of any of the other steps)?
There was a problem hiding this comment.
Maybe? If it in general works I wouldn't worry too much, we can patch it in later.
| @@ -28,6 +28,11 @@ fn detect_llvm_link() -> (&'static str, &'static str) { | |||
| } | |||
|
|
|||
| fn main() { | |||
| if env::var_os("RUST_CHECK").is_some() { | |||
| // If we're just running `check`, there's no need for LLVM to be built. | |||
There was a problem hiding this comment.
Could this print out rerun-if-env-changed to automatically detect when this is altered?
|
@bors: r+ |
|
📌 Commit 86acb09 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Apr 19, 2018
Add rustc_trans to x.py check r? @Mark-Simulacrum I looked at `bootstrap/compile.rs` and `bootstrap/check.rs` to try to work out which steps were appropriate, but I'm sure I've overlooked some details here, so it's worth checking carefully I've got all the steps right (e.g. I wasn't sure whether we want to build LLVM if necessary with `x.py check`, though I thought it was probably better to than to not). From a quick test, it seems to be working, though.
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Apr 19, 2018
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.
r? @Mark-Simulacrum
I looked at
bootstrap/compile.rsandbootstrap/check.rsto try to work out which steps were appropriate, but I'm sure I've overlooked some details here, so it's worth checking carefully I've got all the steps right (e.g. I wasn't sure whether we want to build LLVM if necessary withx.py check, though I thought it was probably better to than to not).From a quick test, it seems to be working, though.