cargo: Fix handling of relative sysroots #1371
Merged
+27
−30
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
Currently, `cc_toolchain.sysroot` is appended as an argument to "CC" and "CXX". This argument, however, will typically be overridden by any --sysroot flag already present in "CFLAGS" and "CXXFLAGS". When sysroot is relative, this fails because cargo_build_script_runner is not executed from the execroot. Do not append `--sysroot` to "CC" and "CXX". Instead, modify any --sysroot arguments with relative paths to be absolute.
|
Thanks for the contribution! This definitely looks nicer, and I think should be fine because we now properly populate CFLAGS and CXXFLAGS (as of #1081), which should contain a @sayrer do you still have a handy repro environment from #659 to make sure it's now safe to effectively revert #664, which this PR does? |
|
@illicitonion I would have included a test but I didn't see an easy way. Would you be OK to merge this without a test for 0.6.0 since it fixes real bugs? We can create an issue to improve the testing of cross-compilation? |
illicitonion
approved these changes
Jun 13, 2022
|
Thanks! 🎉 |
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.
Currently,
cc_toolchain.sysrootis appended as an argument to "CC" and"CXX". This argument, however, will typically be overridden by any
--sysroot flag already present in "CFLAGS" and "CXXFLAGS". When sysroot
is relative, this fails because cargo_build_script_runner is not
executed from the execroot.
Do not append
--sysrootto "CC" and "CXX". Instead, modify any--sysroot arguments with relative paths to be absolute.