Skip to content

Make non-glibc Linux cross-compilation work #55

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

Open
Schnitzel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make non-glibc Linux cross-compilation work #55

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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ nix = { version = "0.29", features = ["fs", "ioctl", "term"] }
num-traits = "0.2"
parking_lot = "0.12"
regex = "1.10"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "charset", "http2"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
slotmap = "1.0"
udev = "0.9"
Expand Down
2 changes: 1 addition & 1 deletion mujina-miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ruint = "1.17.0"
core-foundation = { workspace = true }
io-kit-sys = { workspace = true }

[target.'cfg(target_os = "linux")'.dependencies]
[target.'cfg(all(target_os = "linux", target_env = "gnu"))'.dependencies]
tracing-journald = { workspace = true }
udev = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions mujina-miner/src/tracing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fn build_env_filter() -> EnvFilter {
filter_str.parse().unwrap()
}

#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", target_env = "gnu"))]
mod journald {
use std::env;
use std::io;
Comment on lines +56 to 59
Expand Down Expand Up @@ -127,7 +127,7 @@ mod journald {
}
}

#[cfg(not(target_os = "linux"))]
#[cfg(not(all(target_os = "linux", target_env = "gnu")))]
mod journald {
pub fn try_init() -> bool {
false
Expand Down
6 changes: 3 additions & 3 deletions mujina-miner/src/transport/usb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ use super::TransportEvent as OuterTransportEvent;
// Platform-specific serial port discovery, aliased to a common name
// so call sites are platform-independent.

#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", target_env = "gnu"))]
mod linux;
#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", target_env = "gnu"))]
use linux as platform;

Comment on lines +28 to 32
#[cfg(target_os = "macos")]
Expand All @@ -39,7 +39,7 @@ use macos as platform;
// miner still compiles (e.g., for CPU mining). If this is ever
// called, something has gone wrong because a board matched a USB
// device on a platform where we can't find its serial ports.
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
#[cfg(not(any(all(target_os = "linux", target_env = "gnu"), target_os = "macos")))]
mod platform {
use anyhow::{Result, bail};
use nusb::DeviceInfo;
Expand Down
Loading