user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libm: Fix crate compilation

Browse source 
Update paths and submodules to fix `libm-test` and `util` building so we
will be able to add them to the workspace.
This commit is contained in:
Trevor Gross 2025-04-19 22:15:43 +00:00 • committed by Trevor Gross
parent ca5c4ed8d7
commit cab8700e84
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/compiler-builtins/.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "musl"]
path = libm/crates/musl-math-sys/musl
[submodule "crates/musl-math-sys/musl"]
path = crates/musl-math-sys/musl
url = https://git.musl-libc.org/git/musl
shallow = true

1
library/compiler-builtins/crates/musl-math-sys/musl Submodule

@ -0,0 +1 @@
Subproject commit 0784374d561435f7c787a555aeab8ede699ed298

2
library/compiler-builtins/crates/util/Cargo.toml
View file

@ -13,6 +13,6 @@ unstable-float = ["libm/unstable-float", "libm-test/unstable-float", "rug?/night
[dependencies]
libm = { path = "../../libm", default-features = false }
libm-macros = { path = "../libm-macros" }
libm-test = { path = "../libm-test", default-features = false }
libm-test = { path = "../../libm-test", default-features = false }
musl-math-sys = { path = "../musl-math-sys", optional = true }
rug = { version = "1.27.0", optional = true, default-features = false, features = ["float", "std"] }

6
library/compiler-builtins/libm-test/Cargo.toml
View file

@ -32,9 +32,9 @@ anyhow = "1.0.97"
gmp-mpfr-sys = { version = "1.6.4", optional = true, default-features = false }
iai-callgrind = { version = "0.14.0", optional = true }
indicatif = { version = "0.17.11", default-features = false }
libm = { path = "../../libm", features = ["unstable-public-internals"] }
libm-macros = { path = "../libm-macros" }
musl-math-sys = { path = "../musl-math-sys", optional = true }
libm = { path = "../libm", features = ["unstable-public-internals"] }
libm-macros = { path = "../crates/libm-macros" }
musl-math-sys = { path = "../crates/musl-math-sys", optional = true }
paste = "1.0.15"
rand = "0.9.0"
rand_chacha = "0.9.0"

4
library/compiler-builtins/libm-test/build.rs
View file

@ -1,9 +1,9 @@
#[path = "../../libm/configure.rs"]
#[path = "../libm/configure.rs"]
mod configure;
use configure::Config;
fn main() {
println!("cargo:rerun-if-changed=../../libm/configure.rs");
println!("cargo:rerun-if-changed=../libm/configure.rs");
let cfg = Config::from_env();
configure::emit_test_config(&cfg);
}

4
library/compiler-builtins/libm-test/src/op.rs
View file

@ -16,12 +16,12 @@
use std::fmt;
use std::panic::{RefUnwindSafe, UnwindSafe};
pub use shared::{ALL_OPERATIONS, FloatTy, MathOpInfo, Ty};
pub use shared::{FloatTy, MathOpInfo, Ty, ALL_OPERATIONS};
use crate::{CheckOutput, Float, TupleCall};
mod shared {
include!("../../libm-macros/src/shared.rs");
include!("../../crates/libm-macros/src/shared.rs");
}
/// An enum representing each possible symbol name (`sin`, `sinf`, `sinl`, etc).