about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Bishop <nbishop@nbishop.net>2024-05-11 09:56:59 -0400
committerNicholas Bishop <nbishop@nbishop.net>2024-07-28 20:43:07 -0400
commit0e520c801c70ffce5f19f75f1949367c73020c25 (patch)
tree2b83689e581df08816ee3bd9ed8371a983be9505
parenta1d293337c170329d372c4561c4eb2676d00b7de (diff)
downloadrust-0e520c801c70ffce5f19f75f1949367c73020c25.tar.gz
rust-0e520c801c70ffce5f19f75f1949367c73020c25.zip
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. Also disable it for LLVM targets that don't
support it.
-rw-r--r--build_system/src/build.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/build_system/src/build.rs b/build_system/src/build.rs
index c81b02e2183..23ba0a90181 100644
--- a/build_system/src/build.rs
+++ b/build_system/src/build.rs
@@ -112,7 +112,14 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
     }
     let mut env = env.clone();
 
-    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");