Skip to content

Commit cc0ca37

Browse files
committed
Auto merge of rust-lang#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 d816dac + 0e520c8 commit cc0ca37

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

build_system/src/build.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,14 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
142142
rustflags.push_str(" -Csymbol-mangling-version=v0");
143143
}
144144

145-
let mut args: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &"build", &"--target", &config.target];
145+
let mut args: Vec<&dyn AsRef<OsStr>> = vec![
146+
&"cargo",
147+
&"build",
148+
&"--target",
149+
&config.target,
150+
&"--features",
151+
&"compiler-builtins-no-f16-f128",
152+
];
146153

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

0 commit comments

Comments
 (0)