about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Bishop <nbishop@nbishop.net>2024-05-11 09:56:59 -0400
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2024-08-12 15:17:57 +0200
commit78f5ee65183e816d2cb0499c6766591fc234d8f7 (patch)
tree0837bc75e8846e0415b642453e72a12aeecefd2b
parent1cbbac391100028e2ebb871b81f543ddca243dc9 (diff)
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 8d23f1fda80..8d9518653c5 100644
--- a/build_system/src/build.rs
+++ b/build_system/src/build.rs
@@ -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");