Skip to content

Commit 62776ab

Browse files
committed
Enable std/panic-unwind when checking std
`std/panic-unwind` gets enabled when building the sysroot, but not when checking `std`. This was not a problem with the v1 resolver because it would unify features and just always enable `panic-unwind`. With the v2 resolver, however, this causes `std` to get built twice with different sets of features. This then causes an "multiple candidates for `rmeta` dependency `std` found" error. Always enable the `panic-unwind` feature to avoid this conflict.
1 parent 7c70f3d commit 62776ab

File tree

1 file changed

+1
-0
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-0
lines changed

src/bootstrap/src/core/build_steps/check.rs

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ impl Step for Std {
6767
target,
6868
self.override_build_kind.unwrap_or(builder.kind),
6969
);
70+
cargo.arg("--features=std/panic-unwind");
7071

7172
std_cargo(builder, target, compiler.stage, &mut cargo);
7273
if matches!(builder.config.cmd, Subcommand::Fix { .. }) {

0 commit comments

Comments
 (0)