Backport recent changes to stable/v0.4 #517
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
jschwe
force-pushed
the
jschwender/backports
branch
from
73f96ac
to
d8bd686
Compare
If a user tries to use `corrosion_link_libraries` on static libraries, forward the dependencies to C/C++ consumers by internally calling `target_link_libraries()`. (cherry picked from commit 10da46b)
(cherry picked from commit 42270de)
* msvc: handle flags that come from native-static-libs As of https://github.com/rust-lang/rust/pull/122268/files, rust emits /defaultlib:msvcrt in native-static-libs This ends up in INTERFACE_LINK_LIBRARIES, and then ninja thinks it's a file: ninja: error: '/defaultlib:msvcrt', needed by 'cpp-exe.exe', missing and no known rule to make it This check to see if libraries start with a slash, and then assuming that they are a flag, and putting those in INTERFACE_LINK_OPTIONS instead. (cherry picked from commit fce4fe5)
jschwe
force-pushed
the
jschwender/backports
branch
from
d8bd686
to
254a4b6
Compare
We don't need the is_binary parameter, since we can check the target property. (cherry picked from commit 4f2847f)
The value of the `_CORROSION_VERBOSE_OUTPUT_FLAG` variable (set based on the `CORROSION_VERBOSE_OUTPUT` option) isn't propagated to the `_add_cargo_build` function where it is used: https://github.com/corrosion-rs/corrosion/blob/0a3bdf452995803c334d79dc9a2affbfad51b720/cmake/Corrosion.cmake#L768 Setting it as cache entry fixes that. (cherry picked from commit 74fb8cc)
line 71 does the same thing. (cherry picked from commit 5bfa8ac)
jschwe
force-pushed
the
jschwender/backports
branch
from
254a4b6
to
35598be
Compare
jschwe
force-pushed
the
jschwender/backports
branch
from
35598be
to
83184b0
Compare
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.
No description provided.