diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-12-27 10:30:38 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-12-27 10:30:38 +0100 |
| commit | 52cf01c81579fa1add25e935d26de8cd3e9ea1d7 (patch) | |
| tree | cf1a6b47c9f7ea51d544db738c33eea673a828fc /compiler/rustc_codegen_cranelift/build_sysroot | |
| parent | 0f42d47bd5352028fe297f5e759b7e3763d55cbb (diff) | |
| parent | dbee13661efa269cb4cd57bb4c6b99a19732b484 (diff) | |
| download | rust-52cf01c81579fa1add25e935d26de8cd3e9ea1d7.tar.gz rust-52cf01c81579fa1add25e935d26de8cd3e9ea1d7.zip | |
Merge commit 'dbee13661efa269cb4cd57bb4c6b99a19732b484' into sync_cg_clif-2020-12-27
Diffstat (limited to 'compiler/rustc_codegen_cranelift/build_sysroot')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock | 8 | ||||
| -rw-r--r-- | compiler/rustc_codegen_cranelift/build_sysroot/Cargo.toml | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock b/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock index a2b8f449f00..990557694ea 100644 --- a/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock +++ b/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock @@ -47,9 +47,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "cc" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "cfg-if" @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" dependencies = [ "rustc-std-workspace-core", ] diff --git a/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.toml b/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.toml index e562dedb532..3dbd28c286a 100644 --- a/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.toml +++ b/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.toml @@ -5,13 +5,14 @@ version = "0.0.0" [dependencies] core = { path = "./sysroot_src/library/core" } -compiler_builtins = "0.1" alloc = { path = "./sysroot_src/library/alloc" } std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] } test = { path = "./sysroot_src/library/test" } alloc_system = { path = "./alloc_system" } +compiler_builtins = { version = "=0.1.36", default-features = false } + [patch.crates-io] rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" } |