Fix compiling for x86_64-unknown-linux-gnu when it's not the default target #1559
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
jyn514
added
A-builds
jyn514
commented
Nov 24, 2021
| crate_, version, target, crate_path | ||
| ); | ||
|
|
||
| assert!(target_docs_present); |
There was a problem hiding this comment.
I double checked and this does fail without the fix in this commit.
[2021-11-24T17:58:10Z DEBUG docs_rs::docbuilder::rustwide_builder] adding sources into database
[2021-11-24T17:58:10Z DEBUG docs_rs::db::add_package] Adding package into database
[2021-11-24T17:58:10Z DEBUG docs_rs::db::add_package] Adding doc coverage into database
[2021-11-24T17:58:10Z DEBUG docs_rs::db::add_package] Adding build into database
[2021-11-24T17:58:10Z INFO docs_rs::db::add_package] Updating crate data for xingapi
[2021-11-24T17:58:10Z DEBUG docs_rs::docbuilder::rustwide_builder] cleaning old storage folder rustdoc/xingapi/0.3.3/
[2021-11-24T17:58:10Z DEBUG docs_rs::docbuilder::rustwide_builder] cleaning old storage folder sources/xingapi/0.3.3/
[2021-11-24T17:58:11Z ERROR docs_rs::web::page::templates] Failed to load rustc resource suffix: missing rustc version
[2021-11-24T17:58:11Z INFO docs_rs::web] Running docs.rs web server on http://127.0.0.1:39737
thread 'docbuilder::rustwide_builder::tests::test_cross_compile_non_host_default' panicked at 'assertion failed: target_docs_present', src/docbuilder/rustwide_builder.rs:1004:13
failures:
docbuilder::rustwide_builder::tests::test_cross_compile_non_host_default
|
I think we probably want to override |
jyn514
force-pushed
the
proc-macro-targets
branch
3 times, most recently
from
3fb8c49
to
7629bd8
Compare
|
-let source = build.host_target_dir().join("doc");
+let source = build.host_target_dir().join(HOST_TARGET).join("doc"); |
Nemo157
reviewed
Nov 24, 2021
jyn514
force-pushed
the
proc-macro-targets
branch
4 times, most recently
from
2c619f9
to
9672ae5
Compare
- only skip `--target` for proc-macros
- don't try build non-host targets for proc-macros, since they're not
supported anyway.
- change rustwide_builder to look in the platform-specific target
directory for the default target
- stores all source docs in the target/{target_name} directory, rather
than trying to special case anything
- this also creates the `{target_name}` directory before copying,
because `rename` delegates directly to the syscall and doesn't
create parent directories
jyn514
force-pushed
the
proc-macro-targets
branch
from
9672ae5
to
7007dc9
Compare
|
Yay, this is finally passing tests :) this should be ready for rereview. |
Nemo157
approved these changes
Nov 28, 2021
Nemo157
added a commit
to Nemo157/docs.rs
that referenced
this pull request
Aug 23, 2022
This was the previous behaviour before rust-lang#1559 for the default target and is most likely expected by users.
jyn514
pushed a commit
that referenced
this pull request
Aug 24, 2022
This was the previous behaviour before #1559 for the default target and is most likely expected by users.
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.
Fixes #1556 by only special casing proc-macros instead of any crate targeting the host.
r? @Nemo157