Merge commit '1eded3619d' into sync_cg_clif-2023-07-22

2023-07-22 13:32:34 +00:00 · 2023-07-22 13:32:34 +00:00 · 36708123c1
commit 36708123c1
parent 42f5419dd2 1eded3619d
30 changed files with 668 additions and 170 deletions
--- a/compiler/rustc_codegen_cranelift/build_system/prepare.rs
+++ b/compiler/rustc_codegen_cranelift/build_system/prepare.rs
@ -27,6 +27,7 @@ pub(crate) fn prepare_stdlib(dirs: &Dirs, rustc: &Path) {
        STDLIB_SRC.to_path(dirs).join("Cargo.toml"),
        r#"
 [workspace]
+resolver = "1"
 members = ["./library/sysroot"]

 [patch.crates-io]