Adjust some #[cfg]s to take non-Unix non-Windows operating systems into account
#83013
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
|
r? @oli-obk (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
ghost
commented
Mar 11, 2021
| @@ -1238,6 +1238,11 @@ fn exec_linker( | |||
| err.raw_os_error() == Some(ERROR_FILENAME_EXCED_RANGE) | |||
| } | |||
|
|
|||
| #[cfg(not(any(unix, windows)))] | |||
| fn command_line_too_big(_: &io::Error) -> bool { | |||
| false | |||
There was a problem hiding this comment.
I'm not sure if true is more suitable here, since returning false means it will never fallback to an @-file.
There was a problem hiding this comment.
Not sure. On one hand defaulting to true could cause linking to fail in some cases. On the other hand it would be a slight performance regression that is likely small enough that no-one will investigate, while failed linking would cause people to notice it and patch rustc to add an implementation of command_line_too_big for their platform.
|
r? @bjorn3 |
|
@bors r+ |
|
📌 Commit 00c0872 has been approved by |
bors
added
S-waiting-on-bors
|
@bors rollup=maybe |
Did you mean
|
|
Yeah @bors rollup=always |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 11, 2021
Adjust some `#[cfg]`s to take non-Unix non-Windows operating systems into account This makes compilation to such targets (e.g. `wasm32-wasi`) easier. cc rust-lang/miri#722 rust-lang@bb6d1d0#r48100619
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 11, 2021
Adjust some `#[cfg]`s to take non-Unix non-Windows operating systems into account This makes compilation to such targets (e.g. `wasm32-wasi`) easier. cc rust-lang/miri#722 rust-lang@bb6d1d0#r48100619
This was referenced Mar 11, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 12, 2021
Rollup of 11 pull requests Successful merges: - rust-lang#80385 (Clarify what `Cell::replace` returns) - rust-lang#82571 (Rustdoc Json: Add tests for Reexports, and improve jsondocck) - rust-lang#82860 (Add `-Z unpretty` flag for the THIR) - rust-lang#82950 (convert slice doc link to intra-doc links) - rust-lang#82965 (Add spirv extension handling in compiletest) - rust-lang#82966 (update MSYS2 link in README) - rust-lang#82979 (Fix "run" button position in error index) - rust-lang#83001 (Ignore Vim swap files) - rust-lang#83003 (rustdoc: tweak the search index format) - rust-lang#83013 (Adjust some `#[cfg]`s to take non-Unix non-Windows operating systems into account) - rust-lang#83018 (Reintroduce accidentally deleted assertions.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
ghost
deleted the
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 compilation to such targets (e.g.
wasm32-wasi) easier.cc rust-lang/miri#722 bb6d1d0#r48100619