diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2024-10-07 15:37:07 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-07 15:37:07 +1100 |
| commit | 5c1c49a0c423fc6800a07420faacd9efaac2f38e (patch) | |
| tree | 6cd611f1134678032202881f5bb42193ab590188 | |
| parent | dd4f062b0765a8a152b184f03b08645cac20e0e7 (diff) | |
| parent | 9d2495db60312472506939fdde49bb852b75b414 (diff) | |
| download | rust-5c1c49a0c423fc6800a07420faacd9efaac2f38e.tar.gz rust-5c1c49a0c423fc6800a07420faacd9efaac2f38e.zip | |
Rollup merge of #131308 - mati865:gnullvm-f16-f128, r=tgross35
enable f16 and f128 on windows-gnullvm targets Continuation of https://github.com/rust-lang/rust/pull/130959
| -rw-r--r-- | library/std/build.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/library/std/build.rs b/library/std/build.rs index 7d37d4e9d7d..032326556bd 100644 --- a/library/std/build.rs +++ b/library/std/build.rs @@ -7,6 +7,7 @@ fn main() { let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").expect("CARGO_CFG_TARGET_VENDOR was not set"); let target_env = env::var("CARGO_CFG_TARGET_ENV").expect("CARGO_CFG_TARGET_ENV was not set"); + let target_abi = env::var("CARGO_CFG_TARGET_ABI").expect("CARGO_CFG_TARGET_ABI was not set"); let target_pointer_width: u32 = env::var("CARGO_CFG_TARGET_POINTER_WIDTH") .expect("CARGO_CFG_TARGET_POINTER_WIDTH was not set") .parse() @@ -101,7 +102,7 @@ fn main() { // Unsupported <https://github.com/llvm/llvm-project/issues/94434> ("arm64ec", _) => false, // MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054> - ("x86_64", "windows") if target_env == "gnu" => false, + ("x86_64", "windows") if target_env == "gnu" && target_abi != "llvm" => false, // Infinite recursion <https://github.com/llvm/llvm-project/issues/97981> ("csky", _) => false, ("hexagon", _) => false, @@ -129,7 +130,7 @@ fn main() { // ABI unsupported <https://github.com/llvm/llvm-project/issues/41838> ("sparc", _) => false, // MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054> - ("x86_64", "windows") if target_env == "gnu" => false, + ("x86_64", "windows") if target_env == "gnu" && target_abi != "llvm" => false, // 64-bit Linux is about the only platform to have f128 symbols by default (_, "linux") if target_pointer_width == 64 => true, // Almost all OSs are missing symbol. compiler-builtins will have to add them. |