Set XBUILD_SYSROOT_PATH when building bootloader #41
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.
The
XBUILD_SYSROOT_PATH
environment variable controls wherecargo-xbuild
should create the custom sysroot. This PR sets the variable totarget/bootloader-sysroot
when building the bootloader.The previous behavior was to create the sysroot in a
target/sysroot
directory under the bootloader source directory, which is normally a folder in the local cargo package registry (under~/.cargo
). Modifying the content of this folder does not seem like a good idea. It also caused problems when the.cargo
folder lives under a path that contains spaces due to rust-lang/cargo#6139.This PR also unset the
SYSROOT_DIR
environment variable which seems unused.A side effect of this change is that it should fix the CI build. It was broken for a few days because Azure Pipelines now includes rustup in its Windows image, so that the
.cargo
folder lives underProgram Files
, which leads to a sysroot path with spaces when building the bootloader without theXBUILD_SYSROOT_PATH
variable.