Skip to content

Commit d35f63e

Browse files
committed
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 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.
2 parents ea9f491 + 5cd1e8d commit d35f63e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build_system/build_sysroot.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ fn build_clif_sysroot_for_triple(
271271
if channel == "release" {
272272
build_cmd.arg("--release");
273273
}
274-
build_cmd.arg("--features").arg("backtrace panic-unwind");
274+
build_cmd.arg("--features").arg("backtrace panic-unwind compiler-builtins-no-f16-f128");
275275
build_cmd.env("CARGO_PROFILE_RELEASE_DEBUG", "true");
276276
build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");
277277
if compiler.triple.contains("apple") {

0 commit comments

Comments
 (0)