Skip to content

Commit

Permalink
Enable std/panic-unwind when checking std
Browse files Browse the repository at this point in the history
`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.
  • Loading branch information
tgross35 committed Aug 2, 2024
1 parent f5bbf74 commit 5d11e21
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/bootstrap/src/core/build_steps/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ impl Step for Std {
target,
self.override_build_kind.unwrap_or(builder.kind),
);
cargo.arg("--features=std/panic-unwind");

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

0 comments on commit 5d11e21

Please sign in to comment.