Skip to content

Commit 357deaa

Browse files
committed
Move disabling of f16 and f128 in compiler-builtins to liballoc
This way it gets disabled even when trying to compile just liballoc and not the sysroot crate.
1 parent 2853388 commit 357deaa

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@ Date: Fri, 9 Aug 2024 15:44:51 +0000
44
Subject: [PATCH] Disable f16 and f128 in compiler-builtins
55

66
---
7-
library/sysroot/Cargo.toml | 2 +-
7+
library/liballoc/Cargo.toml | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

10-
diff --git a/library/sysroot/Cargo.toml b/library/sysroot/Cargo.toml
10+
diff --git a/library/liballoc/Cargo.toml b/library/liballoc/Cargo.toml
1111
index 7165c3e48af..968552ad435 100644
12-
--- a/library/sysroot/Cargo.toml
13-
+++ b/library/sysroot/Cargo.toml
12+
--- a/library/alloc/Cargo.toml
13+
+++ b/library/alloc/Cargo.toml
1414
@@ -11,7 +11,7 @@ test = { path = "../test" }
15+
edition = "2021"
1516

16-
# Forward features to the `std` crate as necessary
17-
[features]
18-
-default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"]
19-
+default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind", "compiler-builtins-no-f16-f128"]
20-
backtrace = ["std/backtrace"]
21-
compiler-builtins-c = ["std/compiler-builtins-c"]
22-
compiler-builtins-mem = ["std/compiler-builtins-mem"]
17+
[dependencies]
18+
core = { path = "../core" }
19+
-compiler_builtins = { version = "=0.1.138", features = ['rustc-dep-of-std'] }
20+
+compiler_builtins = { version = "=0.1.138", features = ['rustc-dep-of-std', 'no-f16-f128'] }
21+
22+
[dev-dependencies]
23+
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
2324
--
2425
2.34.1
2526

0 commit comments

Comments
 (0)