Skip to content

libm: Fix crate compilation #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2025
Merged

libm: Fix crate compilation #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions crates/musl-math-sys/musl
Open in desktop
Submodule musl added at 078437
2 changes: 1 addition & 1 deletion crates/util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 3 deletions libm-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions libm-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions libm-test/src/op.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down