Skip to content
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

Set XBUILD_SYSROOT_PATH when building bootloader #41

Merged
merged 1 commit into from
Jun 3, 2019

Conversation

phil-opp
Copy link
Member

@phil-opp phil-opp commented Jun 3, 2019

The XBUILD_SYSROOT_PATH environment variable controls where cargo-xbuild should create the custom sysroot. This PR sets the variable to target/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 under Program Files, which leads to a sysroot path with spaces when building the bootloader without the XBUILD_SYSROOT_PATH variable.

@phil-opp phil-opp merged commit 12a6a72 into master Jun 3, 2019
@bors bors bot deleted the bootloader-sysroot branch June 3, 2019 13:19
phil-opp added a commit that referenced this pull request Jun 3, 2019
@phil-opp
Copy link
Member Author

phil-opp commented Jun 3, 2019

Released as version 0.7.5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant