Skip to content

Commit

Permalink
Auto merge of #125016 - nicholasbishop:bishop-cb-112, r=tgross35
Browse files Browse the repository at this point in the history
Update compiler_builtins to 0.1.114

The `weak-intrinsics` feature was removed from compiler_builtins in rust-lang/compiler-builtins#598, so dropped the `compiler-builtins-weak-intrinsics` feature from alloc/std/sysroot.

In rust-lang/compiler-builtins#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.
  • Loading branch information
bors committed Jul 29, 2024
2 parents ea9f491 + 5cd1e8d commit d35f63e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build_system/build_sysroot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down

0 comments on commit d35f63e

Please sign in to comment.