Fix cargo_build_script breakage when SYSROOT is specified#976
Merged
scentini merged 4 commits intobazelbuild:mainfrom Oct 15, 2021
Merged
Fix cargo_build_script breakage when SYSROOT is specified#976scentini merged 4 commits intobazelbuild:mainfrom
cargo_build_script breakage when SYSROOT is specified#976scentini merged 4 commits intobazelbuild:mainfrom
Conversation
scentini
changed the title
cargo_build_script when SYSROOT is specifiedcargo_build_script breakage when SYSROOT is specified
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
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.
#973 changed the type of
cc_pathfromstd::ffi::OsStringtostd::path::PathBuf, which breaks builds that specifySYSROOT. Asstd::path::PathBuf::push(x)replaces the current path when x is absolute, thecc_path.push(&exec_root.join(sysroot_path));line ends up dropping everything that was previously added tocc_path.This PR fixes the issue.