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 d816dac + 0e520c8 commit cc0ca37
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion build_system/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,14 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
rustflags.push_str(" -Csymbol-mangling-version=v0");
}

let mut args: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &"build", &"--target", &config.target];
let mut args: Vec<&dyn AsRef<OsStr>> = vec![
&"cargo",
&"build",
&"--target",
&config.target,
&"--features",
&"compiler-builtins-no-f16-f128",
];

if config.no_default_features {
rustflags.push_str(" -Csymbol-mangling-version=v0");
Expand Down

0 comments on commit cc0ca37

Please sign in to comment.