Fixes rustdoc in stage 0, stage 1 #58238
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
|
cc @RalfJung |
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
changed the title
src/bootstrap/tool.rs
Outdated
| panic!("rustdoc in stage 0 must be snapshot rustdoc"); | ||
| } | ||
| return builder.initial_rustc.with_file_name(exe("rustdoc", &target_compiler.host)); | ||
| } | ||
| let target = target_compiler.host; | ||
| let build_compiler = if target_compiler.stage == 0 { |
There was a problem hiding this comment.
I think this clause is no longer necessary, right?
When a request for rustdoc is passed for stage 0, x.py build --stage 0
src/tools/rustdoc or ensure(tool::Rustdoc { .. }) with top_stage = 0, we
return the rustdoc for that compiler (i.e., the beta rustdoc).
The RUSTDOC_LIBDIR should be rustc_libdir, not sysroot_libdir; rustdoc is like the compiler and should link against rustc's libdir. Some people currently (i.e., in general, may not be on master) have doc tests working, but no attempt to determine why has been attempted.
Mark-Simulacrum
force-pushed
the
doctest-fix
branch
from
a50bd07 to
bb23b17
Compare
|
@bors r=alexcrichton |
|
📌 Commit bb23b17 has been approved by |
bors
added
S-waiting-on-bors
|
Adding space for rollup, @bors p=1 |
bors
added a commit
that referenced
this pull request
Feb 13, 2019
Fixes rustdoc in stage 0, stage 1
When a request for rustdoc is passed for stage 0, x.py build --stage 0
src/tools/rustdoc or ensure(tool::Rustdoc { .. }) with top_stage = 0, we
return the rustdoc for that compiler (i.e., the beta rustdoc).
This fixes stage 0 of #52186 as well as being part of general workflow improvements (making stage 0 testing for std work) for rustbuild.
The stage 1 fix (second commit) completely resolves the problem, so this fixes #52186.
|
☀️ Test successful - checks-travis, status-appveyor |
|
Looks like it break #52317 again. |
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.
When a request for rustdoc is passed for stage 0, x.py build --stage 0
src/tools/rustdoc or ensure(tool::Rustdoc { .. }) with top_stage = 0, we
return the rustdoc for that compiler (i.e., the beta rustdoc).
This fixes stage 0 of #52186 as well as being part of general workflow improvements (making stage 0 testing for std work) for rustbuild.
The stage 1 fix (second commit) completely resolves the problem, so this fixes #52186.