diff options
| author | Erin Power <erin.power@embark-studios.com> | 2021-04-30 14:49:58 +0200 |
|---|---|---|
| committer | Erin Power <erin.power@embark-studios.com> | 2021-04-30 14:49:58 +0200 |
| commit | 505aa48f24abb36c07bea7f8d4de321de193cc41 (patch) | |
| tree | a6b214063a4bbcdc2c037693314781df215ec2c9 /compiler/rustc_codegen_cranelift/build_sysroot | |
| parent | 49920bc581743d6edb9f82fbff4cbafebc212619 (diff) | |
| parent | ddd4ce25535cf71203ba3700896131ce55fde795 (diff) | |
| download | rust-505aa48f24abb36c07bea7f8d4de321de193cc41.tar.gz rust-505aa48f24abb36c07bea7f8d4de321de193cc41.zip | |
Sync rustc_codegen_cranelift 'ddd4ce25535cf71203ba3700896131ce55fde795'
Diffstat (limited to 'compiler/rustc_codegen_cranelift/build_sysroot')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock | 19 | ||||
| -rwxr-xr-x | compiler/rustc_codegen_cranelift/build_sysroot/prepare_sysroot_src.sh | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock b/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock index 09c5d7590ab..e058a972ead 100644 --- a/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock +++ b/compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.39" +version = "0.1.40" dependencies = [ "rustc-std-workspace-core", ] @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.91" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" dependencies = [ "rustc-std-workspace-core", ] @@ -167,6 +167,7 @@ dependencies = [ name = "panic_abort" version = "0.0.0" dependencies = [ + "alloc", "cfg-if", "compiler_builtins", "core", @@ -242,11 +243,23 @@ dependencies = [ "panic_abort", "panic_unwind", "rustc-demangle", + "std_detect", "unwind", "wasi", ] [[package]] +name = "std_detect" +version = "0.1.5" +dependencies = [ + "cfg-if", + "compiler_builtins", + "libc", + "rustc-std-workspace-alloc", + "rustc-std-workspace-core", +] + +[[package]] name = "sysroot" version = "0.0.0" dependencies = [ diff --git a/compiler/rustc_codegen_cranelift/build_sysroot/prepare_sysroot_src.sh b/compiler/rustc_codegen_cranelift/build_sysroot/prepare_sysroot_src.sh index c90205db0fb..f7fcef10774 100755 --- a/compiler/rustc_codegen_cranelift/build_sysroot/prepare_sysroot_src.sh +++ b/compiler/rustc_codegen_cranelift/build_sysroot/prepare_sysroot_src.sh @@ -32,7 +32,7 @@ popd git clone https://github.com/rust-lang/compiler-builtins.git || echo "rust-lang/compiler-builtins has already been cloned" pushd compiler-builtins git checkout -- . -git checkout 0.1.39 +git checkout 0.1.40 git apply ../../crate_patches/000*-compiler-builtins-*.patch popd |