Skip to content

Commit 0dc9e9c

Browse files
committed
Auto merge of #61828 - RalfJung:cfg-if, r=alexcrichton
make sure we use cfg-if as a std dependency xargo currently fails to build libstd because this feature is missing. My guess is that it works in rustc because the feature is enabled elsewhere, but that does not help for a libstd-only build. Miri is currently in a state where it is shipped but broken, which makes CI fail for projects that are tested in Miri. So this is kind of urgent. Cc @alexcrichton #61720
2 parents bb16e72 + e5f840e commit 0dc9e9c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ crate-type = ["dylib", "rlib"]
1515

1616
[dependencies]
1717
alloc = { path = "../liballoc" }
18-
cfg-if = "0.1.8"
18+
cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
1919
panic_unwind = { path = "../libpanic_unwind", optional = true }
2020
panic_abort = { path = "../libpanic_abort" }
2121
core = { path = "../libcore" }

0 commit comments

Comments
 (0)