Rework how bootstrap tools are built #58897
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 has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
The job 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 |
Mark-Simulacrum
force-pushed
the
tool-rework
branch
from
51f085e to
80750f5
Compare
|
The job 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 |
Mark-Simulacrum
force-pushed
the
tool-rework
branch
from
80750f5 to
7b7fc8c
Compare
|
The job 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 |
This avoids building compilers that we don't need -- most tools will work just fine with the downloaded compiler.
This allows us to e.g. test compiletest, including doctests, in stage 0 without building a fresh compiler and rustdoc.
Mark-Simulacrum
force-pushed
the
tool-rework
branch
from
7b7fc8c to
03718ed
Compare
|
@bors: r+ |
|
📌 Commit 03718ed has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 03718ed with merge 50f6de0b0e2ba07a2d5a000b52edd6e248383db3... |
|
The job 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 |
|
💔 Test failed - checks-travis |
bors
added
S-waiting-on-review
|
@bors retry I hope the linker failure is a spurious problem... |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Mar 20, 2019
Rework how bootstrap tools are built This makes bootstrap tools buildable and testable in stage 0 with the downloaded bootstrap compiler, futhermore, it makes it such that they cannot be built in any other stage. Notably, this will also mean that compiletest may need to wait a cycle before it can use changes to `libtest`, as it no longer depends on the in-tree libtest.
|
☀️ Test successful - checks-travis, status-appveyor |
o01eg
reviewed
Mar 21, 2019
| cmd.env("RUSTC_STAGE", compiler.stage.to_string()) | ||
| .env("RUSTC_SYSROOT", self.sysroot(compiler)) | ||
| // Note that this is *not* the sysroot_libdir because rustdoc must be linked | ||
| // equivalently to rustc. | ||
| .env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler)) | ||
| .env("CFG_RELEASE_CHANNEL", &self.config.channel) | ||
| .env("RUSTDOC_REAL", self.rustdoc(host)) | ||
| .env("RUSTDOC_REAL", self.rustdoc(compiler)) |
There was a problem hiding this comment.
Looks like this line fixed #58587. After it std is documented with rustdoc stage1 with stage1 libraries.
This was referenced Mar 21, 2019
gentoo-bot
pushed a commit
to gentoo/gentoo
that referenced
this pull request
Apr 14, 2019
also speed up bootstrap a bit with upstream commit Upstream patch url: rust-lang/rust#58897 Bug: https://bugs.gentoo.org/683246 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev <[email protected]>
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.
This makes bootstrap tools buildable and testable in stage 0 with the downloaded bootstrap compiler, futhermore, it makes it such that they cannot be built in any other stage.
Notably, this will also mean that compiletest may need to wait a cycle before it can use changes to
libtest, as it no longer depends on the in-tree libtest.