diff options
| author | bors <bors@rust-lang.org> | 2024-07-29 07:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-29 07:41:33 +0000 |
| commit | d35f63e3030b78ced7af2943ada5b419d8ab7cda (patch) | |
| tree | 50765a226e71e26024be1bce527ae748282587fc | |
| parent | ea9f491696d9b39e9a6c4942ce7ef973ad36a271 (diff) | |
| parent | 5cd1e8d9ab8594c0281906a1cc69a2546eae7118 (diff) | |
| download | rust-d35f63e3030b78ced7af2943ada5b419d8ab7cda.tar.gz rust-d35f63e3030b78ced7af2943ada5b419d8ab7cda.zip | |
Auto merge of #125016 - nicholasbishop:bishop-cb-112, r=tgross35
Update compiler_builtins to 0.1.114 The `weak-intrinsics` feature was removed from compiler_builtins in https://github.com/rust-lang/compiler-builtins/pull/598, so dropped the `compiler-builtins-weak-intrinsics` feature from alloc/std/sysroot. In https://github.com/rust-lang/compiler-builtins/pull/593, some builtins for f16/f128 were added. These don't work for all compiler backends, so add a `compiler-builtins-no-f16-f128` feature and disable it for cranelift and gcc.
| -rw-r--r-- | build_system/build_sysroot.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_system/build_sysroot.rs b/build_system/build_sysroot.rs index 5e9967aaeb1..ed8b5b906d2 100644 --- a/build_system/build_sysroot.rs +++ b/build_system/build_sysroot.rs @@ -271,7 +271,7 @@ fn build_clif_sysroot_for_triple( if channel == "release" { build_cmd.arg("--release"); } - build_cmd.arg("--features").arg("backtrace panic-unwind"); + build_cmd.arg("--features").arg("backtrace panic-unwind compiler-builtins-no-f16-f128"); build_cmd.env("CARGO_PROFILE_RELEASE_DEBUG", "true"); build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif"); if compiler.triple.contains("apple") { |