-
Notifications
You must be signed in to change notification settings - Fork 378
Rewrite cxx-build crate #276
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
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
We'll put the OUT_DIR in here as well, to reduce the amount of code that needs to be fallible.
This one is already handled by the following call to `write`.
When Cargo runs a build script, its current directory is set to the manifest directory of the crate whose build script it is. That means if crate A depends on crate B depends on cxx-build, the previous logic would have found B's target dir (somewhere in the Cargo registry cache) rather than the intended A target dir being used for the current build.
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.
Fixes #213. Fixes #88. Supersedes #214. Supersedes #253.
The major improvement is that we no longer care where Cargo's target dir is located. Instead of doing anything based on relative paths from the target dir, we do it only based on the paths the user passes to cxx_build::bridge, which we know are relative to the manifest dir because that's the current directory when a build script runs.
For an invocation like
cxx_build::bridge("src/lib.rs")
the resulting layout of the OUT_DIR would be:and the include paths would be
#include "cxx-demo/src/lib.rs.h"
, wherecxx-demo
is the crate name andsrc/lib.rs
is the path that the crate's build script gave cxx_build.