The missing lib #2710
Merged
The missing lib #2710
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? @wycats (rust_highfive has picked a reviewer for you, use r? to override) |
sbeckeriv
force-pushed
the
the-missing-lib
branch
from
e2ce136 to
65b9e10
Compare
| @@ -109,6 +109,10 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) | |||
| .env("PROFILE", if cx.build_config.release {"release"} else {"debug"}) | |||
| .env("HOST", &cx.config.rustc_info().host); | |||
|
|
|||
| if unit.pkg.manifest().links().is_some(){ | |||
| p.env("CARGO_LIB", unit.pkg.manifest().links().as_ref().unwrap()); | |||
There was a problem hiding this comment.
This might be more naturally written with:
if let Some(links) = unit.pkg.manifest().links() {
p.env("...", links);
}
|
Thanks @sbeckeriv! The only question I'd have is the name of this env var. |
sbeckeriv
force-pushed
the
the-missing-lib
branch
from
65b9e10 to
dbc623a
Compare
|
Thanks! I am still learning to use things like if let! I also updated the name. |
sbeckeriv
force-pushed
the
the-missing-lib
branch
from
dbc623a to
388028e
Compare
Dearest Reviewer, This pull request allows the value of project.links to be passed into the build script via an environment variable. This closes rust-lang#1220 . I have added a test that makes sure that the environment variable is set. Also note I am using CARGO_LIB not LIB because it appears to be used for windows in appveyor. I think CARGO_LIB fits better. I have also updated the documentation to reflect the new variable. Thanks! Becker [Updated] Github comments moved to CARGO_MANIFEST_LINKS Fix if statement
bors
added a commit
that referenced
this pull request
May 18, 2016
The missing lib Dearest Reviewer, This pull request allows the value of project.links to be passed into the build script via an environment variable. This closes #1220 . I have added a test that makes sure that the environment variable is set. Also note I am using CARGO_LIB not LIB because it appears to be used for windows in appveyor. I think CARGO_LIB fits better. I have also updated the documentation to reflect the new variable. Thanks! Becker
|
☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64 |
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.
Dearest Reviewer,
This pull request allows the value of project.links to be passed into
the build script via an environment variable. This closes #1220 . I have
added a test that makes sure that the environment variable is set. Also
note I am using CARGO_LIB not LIB because it appears to be used for
windows in appveyor. I think CARGO_LIB fits better.
I have also updated the documentation to reflect the new variable.
Thanks!
Becker