Rust: improve Cargo's detection of link dependencies from CMake #1708
+101
−40
Conversation
This file contains hidden or 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
Modules written in Rust need to link against some C++ libraries (like everest-framework) that are compiled with CMake, which requires us to pass the paths to said dependencies to Cargo to set some linker flags. Before this commit this was done in one of two ways: - By passing a path to the installation directory containing the object files. This has the downside of needing to run `make install` once before you can build any Rust modules. - By guessing the path to `everest-framework`s build directory, then relying on CMake's internal directory structure to find the libraries automatically. This doesn't support multi-config builds, and only works when building from the everest-framework repo. This commit makes CMake generate a `everestrs-link-dependencies.txt` file directly containing the paths to the required objects, which fixes the aforementioned issues the existing methods have. It looks like there were plans to do this exact thing before, the file was already being generated by CMake but never used. Signed-off-by: Ivar Scholten <[email protected]>
Apparently Cargo performs semver patch updates when generating a new lockfile, unless the version is preceded with an equals sign. Since CMake generates its own Cargo workspace it always creates a lockfile on clean builds, breaking the FFI bindings since we need a specific version of the `cxx` library. Signed-off-by: Ivar Scholten <[email protected]>
IvarWithoutBones
requested review from
Pietfried,
SebaLukas,
SirVer,
a-w50,
andistorm,
corneliusclaussen,
djchhp,
dorezyuk,
hikinggrass,
james-ctc and
mlitre
as code owners
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Describe your changes
This passes dependencies from CMake to Cargo in a more reliable fashion. See the commit descriptions for more details.
Issue ticket number and link
Checklist before requesting a review