Skip to content

Commit 942910c

Browse files
committed
Emerald: Used relative emerald_std because of libm
1 parent 0664391 commit 942910c

File tree

3 files changed

+19
-93
lines changed

3 files changed

+19
-93
lines changed

Cargo.lock

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,23 +1212,20 @@ dependencies = [
12121212

12131213
[[package]]
12141214
name = "emerald_kernel_user_link"
1215-
version = "0.2.3"
1216-
source = "registry+https://github.com/rust-lang/crates.io-index"
1217-
checksum = "553132cab85a2a497d1ea12e887b0c02ad4d1a17f09900ec74640eacdaa87b97"
1215+
version = "0.2.4"
12181216
dependencies = [
12191217
"compiler_builtins",
12201218
"rustc-std-workspace-core",
12211219
]
12221220

12231221
[[package]]
12241222
name = "emerald_std"
1225-
version = "0.2.5"
1226-
source = "registry+https://github.com/rust-lang/crates.io-index"
1227-
checksum = "b3728e4814248417c26c01de4c514e4c8a675d77e36eae094d41378a22e12223"
1223+
version = "0.2.7"
12281224
dependencies = [
12291225
"compiler_builtins",
12301226
"emerald_kernel_user_link",
12311227
"increasing_heap_allocator",
1228+
"libm 0.2.8 (git+https://github.com/Amjad50/libm?branch=compiling_libm_for_std)",
12321229
"rustc-std-workspace-alloc",
12331230
"rustc-std-workspace-core",
12341231
]
@@ -1780,7 +1777,7 @@ version = "2.1.3"
17801777
source = "registry+https://github.com/rust-lang/crates.io-index"
17811778
checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
17821779
dependencies = [
1783-
"libm",
1780+
"libm 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
17841781
]
17851782

17861783
[[package]]
@@ -1985,8 +1982,6 @@ dependencies = [
19851982
[[package]]
19861983
name = "increasing_heap_allocator"
19871984
version = "0.1.3"
1988-
source = "registry+https://github.com/rust-lang/crates.io-index"
1989-
checksum = "f78a0467200b54f544152c480d8863463dfbee92af6d7fe279f68bf287e5c928"
19901985
dependencies = [
19911986
"compiler_builtins",
19921987
"rustc-std-workspace-alloc",
@@ -2241,9 +2236,18 @@ dependencies = [
22412236

22422237
[[package]]
22432238
name = "libm"
2244-
version = "0.2.7"
2239+
version = "0.2.8"
22452240
source = "registry+https://github.com/rust-lang/crates.io-index"
2246-
checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
2241+
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
2242+
2243+
[[package]]
2244+
name = "libm"
2245+
version = "0.2.8"
2246+
source = "git+https://github.com/Amjad50/libm?branch=compiling_libm_for_std#9ded10304060e82d5cb71fcf8ae99a9538802c65"
2247+
dependencies = [
2248+
"compiler_builtins",
2249+
"rustc-std-workspace-core",
2250+
]
22472251

22482252
[[package]]
22492253
name = "libz-sys"
@@ -2608,7 +2612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
26082612
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
26092613
dependencies = [
26102614
"autocfg",
2611-
"libm",
2615+
"libm 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
26122616
]
26132617

26142618
[[package]]

library/std/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ r-efi-alloc = { version = "1.0.0", features = ['rustc-dep-of-std'] }
5959

6060
[target.'cfg(target_os = "emerald")'.dependencies]
6161
# This is from `https://github.com/Amjad50/Emerald`, i.e. it must be run from that context
62-
emerald_std = { version = "0.2.5", features = ['rustc-dep-of-std'] }
62+
# TODO: for now we are using relative path, as we are using `libm` from `git` and we can't publish
63+
# that. Fix it later
64+
emerald_std = { version = "0.2.5", features = ['rustc-dep-of-std'], path = "../../../../libraries/emerald_std" }
6365

6466
[features]
6567
backtrace = [

library/std/src/sys/cmath/emerald.rs

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)