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

The compiler_builtins library is now a crates.io dependency of alloc #23

Merged
merged 1 commit into from
Dec 14, 2018

Conversation

phil-opp
Copy link
Member

@phil-opp phil-opp commented Dec 14, 2018

rust-lang/rust#56092 changed the build process of the sysroot in the following way:

The compiler_builtins is now a normal crates.io crate: https://crates.io/crates/compiler_builtins. Since compiler_buitlins depends on libcore, but no sysroot exists yet when building liballoc, it has a special rustc-std-workspace-core feature that overwrites the core dependency with an empty crates.io crate called rustc-std-workspace-core. This makes it possible to override the core dependency through a patch section in the Cargo.toml of liballoc.

For time reasons, this PR takes a different approach: Instead of using the rustc-std-workspace-core feature and a patch section to build core together with liballoc, we keep on building core first and then set the sysroot in RUSTFLAGS when compiling liballoc. This way, both liballoc and compiler_builtins use the core library that we built in the previous step.

Fixes #22

@phil-opp phil-opp merged commit 5a26976 into master Dec 14, 2018
@phil-opp phil-opp deleted the compiler_builtins_crates_io branch December 14, 2018 16:44
@phil-opp
Copy link
Member Author

Published as 0.5.1

@HadrienG2
Copy link

Thanks for saving the uefi-rs build! 😃

@phil-opp
Copy link
Member Author

You're welcome :)

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.

2 participants