diff options
| author | bors <bors@rust-lang.org> | 2024-07-29 07:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-29 07:41:33 +0000 |
| commit | cc0ca37d6df4ecf60cd57033213abcb35a960c5a (patch) | |
| tree | 00e18078cf6a491bda7db6c06bcf611cb2ad54b9 /build_system | |
| parent | d816dac2d95349a1ef88d4e2b4148df56acad33a (diff) | |
| parent | 0e520c801c70ffce5f19f75f1949367c73020c25 (diff) | |
| download | rust-cc0ca37d6df4ecf60cd57033213abcb35a960c5a.tar.gz rust-cc0ca37d6df4ecf60cd57033213abcb35a960c5a.zip | |
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 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.
Diffstat (limited to 'build_system')
| -rw-r--r-- | build_system/src/build.rs | 9 |
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"); |