mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable --cfg bootstrap in libcore

Browse source 
This is needed to permit us building core_arch which is a submodule dep
(so we can't snap it to the new beta compiler).
This commit is contained in:
Mark Rousskov 2019-08-12 19:42:41 -04:00
parent 2601c86487
commit 6575a96198
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/bin/rustc.rs
View file

@ -110,7 +110,11 @@ fn main() {
// Non-zero stages must all be treated uniformly to avoid problems when attempting to uplift // Non-zero stages must all be treated uniformly to avoid problems when attempting to uplift
// compiler libraries and such from stage 1 to 2. // compiler libraries and such from stage 1 to 2.
if stage == "0" { //
// FIXME: the fact that core here is excluded is due to core_arch from our stdarch submodule
// being broken on the beta compiler with bootstrap passed, so this is a temporary workaround
// (we've just snapped, so there are no cfg(bootstrap) related annotations in core).
if stage == "0" && crate_name != Some("core") {
cmd.arg("--cfg").arg("bootstrap"); cmd.arg("--cfg").arg("bootstrap");
} }