Skip to content

Commit 6575a96

Browse files
committedAug 14, 2019
Disable --cfg bootstrap in libcore
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).
1 parent 2601c86 commit 6575a96

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed
 

Diff for: ‎src/bootstrap/bin/rustc.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ fn main() {
110110

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

0 commit comments

Comments
 (0)
Please sign in to comment.