Require rlibs for dependent crates when linking static executables #44279
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? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ |
|
📌 Commit 4950756 has been approved by |
arielb1
added
the
S-waiting-on-bors
|
@bors: rollup |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Sep 8, 2017
Require rlibs for dependent crates when linking static executables This handles the case for `CrateTypeExecutable` and `+crt_static`. I reworked the match block to avoid duplicating the `attempt_static` and error checking code again (this case would have been a copy of the `CrateTypeCdylib`/`CrateTypeStaticlib` case). On `linux-musl` targets where `std` was built with `crt_static = false` in `config.toml`, this change brings the test suite from entirely failing to mostly passing. This change should not affect behavior for other crate types, or for targets which do not respect `+crt_static`.
|
☔ The latest upstream changes (presumably #44142) made this pull request unmergeable. Please resolve the merge conflicts. |
smaeul
force-pushed
the
crt_static-deps
branch
from
4950756 to
6b4bdbd
Compare
|
@bors: r=alexcrichton |
|
📌 Commit 6b4bdbd has been approved by |
|
@bors: rollup |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Sep 13, 2017
Require rlibs for dependent crates when linking static executables This handles the case for `CrateTypeExecutable` and `+crt_static`. I reworked the match block to avoid duplicating the `attempt_static` and error checking code again (this case would have been a copy of the `CrateTypeCdylib`/`CrateTypeStaticlib` case). On `linux-musl` targets where `std` was built with `crt_static = false` in `config.toml`, this change brings the test suite from entirely failing to mostly passing. This change should not affect behavior for other crate types, or for targets which do not respect `+crt_static`.
|
It looks like the compile failure is happening in the intended way, but the error message is different because it's being caught earlier. Should I just change the expected error message in the test? Edit: hmm, but the error path and therefore the message will be different based on whether the executable was static. Do I need another special case here? should we make the error messages match? |
|
If possible yeah let's just get the errors to emit through a common path to ensure that they're the same |
smaeul
force-pushed
the
crt_static-deps
branch
from
6b4bdbd to
841b4a2
Compare
tidy error for you @smaeul! |
carols10cents
added
S-waiting-on-author
|
How do I fix that without making the error message shorter? |
|
@smaeul You could remove the spaces around |
This handles the case for `CrateTypeExecutable` and `+crt_static`. I reworked the match block to avoid duplicating the `attempt_static` and error checking code again (this case would have been a copy of the `CrateTypeCdylib`/`CrateTypeStaticlib` case). On `linux-musl` targets where `std` was built with `crt_static = false` in `config.toml`, this change brings the test suite from entirely failing to mostly passing. This change should not affect behavior for other crate types, or for targets which do not respect `+crt_static`.
smaeul
force-pushed
the
crt_static-deps
branch
from
841b4a2 to
e071e74
Compare
|
Test failure: |
smaeul
force-pushed
the
crt_static-deps
branch
from
e071e74 to
314c2b1
Compare
|
This looks like it's ready for rereview @alexcrichton ! |
carols10cents
added
S-waiting-on-review
|
@bors: r+ |
|
📌 Commit 314c2b1 has been approved by |
bors
added a commit
that referenced
this pull request
Sep 25, 2017
Require rlibs for dependent crates when linking static executables This handles the case for `CrateTypeExecutable` and `+crt_static`. I reworked the match block to avoid duplicating the `attempt_static` and error checking code again (this case would have been a copy of the `CrateTypeCdylib`/`CrateTypeStaticlib` case). On `linux-musl` targets where `std` was built with `crt_static = false` in `config.toml`, this change brings the test suite from entirely failing to mostly passing. This change should not affect behavior for other crate types, or for targets which do not respect `+crt_static`.
|
☀️ Test successful - status-appveyor, status-travis |
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 handles the case for
CrateTypeExecutableand+crt_static. I reworked the match block to avoid duplicating theattempt_staticand error checking code again (this case would have been a copy of theCrateTypeCdylib/CrateTypeStaticlibcase).On
linux-musltargets wherestdwas built withcrt_static = falseinconfig.toml, this change brings the test suite from entirely failing to mostly passing.This change should not affect behavior for other crate types, or for targets which do not respect
+crt_static.