Skip to content

stdbuf: support cross-platform building #11609

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
YumeYuka wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −29
Open

stdbuf: support cross-platform building #11609

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
52 changes: 23 additions & 29 deletions src/uu/stdbuf/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,6 @@ use std::fs;
use std::path::Path;
use std::process::Command;

#[cfg(any(
target_os = "linux",
target_os = "android",
target_os = "freebsd",
target_os = "netbsd",
target_os = "openbsd",
target_os = "dragonfly"
))]
mod platform {
pub const DYLIB_EXT: &str = ".so";
}

#[cfg(target_vendor = "apple")]
mod platform {
pub const DYLIB_EXT: &str = ".dylib";
}

#[cfg(target_os = "cygwin")]
mod platform {
pub const DYLIB_EXT: &str = ".dll";
}

fn main() {
println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rerun-if-changed=src/libstdbuf/src/libstdbuf.rs");
Expand Down Expand Up @@ -58,14 +36,29 @@ fn main() {
let out_dir = env::var("OUT_DIR").expect("OUT_DIR not set");
let target = env::var("TARGET").unwrap_or_else(|_| "unknown".to_string());

let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap();
let target_family = env::var("CARGO_CFG_TARGET_FAMILY").unwrap();

if target_family != "unix" {
return;
}
let dylib_ext = if target_vendor == "apple" {
".dylib"
} else if target_os == "cygwin" {
".dll"
} else {
".so"
};

// Check if we're building from the repository (where src/libstdbuf exists)
// or from crates.io (where it doesn't)
let libstdbuf_src = Path::new("src/libstdbuf");
if !libstdbuf_src.exists() {
// When building from crates.io, libstdbuf is already available as a dependency
// We can't build it here, so we'll need to handle this differently
// For now, we'll create a dummy library file to satisfy the include_bytes! macro
let lib_name = format!("libstdbuf{}", platform::DYLIB_EXT);
let lib_name = format!("libstdbuf{dylib_ext}");
let dest_path = Path::new(&out_dir).join(&lib_name);

// Create an empty file as a placeholder
Expand Down Expand Up @@ -108,11 +101,12 @@ fn main() {
assert!(status.success(), "Failed to build libstdbuf");

// Copy the built library to OUT_DIR for include_bytes! to find
#[cfg(target_os = "cygwin")]
let lib_name = format!("stdbuf{}", platform::DYLIB_EXT);
#[cfg(not(target_os = "cygwin"))]
let lib_name = format!("libstdbuf{}", platform::DYLIB_EXT);
let dest_path = Path::new(&out_dir).join(format!("libstdbuf{}", platform::DYLIB_EXT));
let lib_name = if target_os == "cygwin" {
format!("stdbuf{dylib_ext}")
} else {
format!("libstdbuf{dylib_ext}")
};
let dest_path = Path::new(&out_dir).join(format!("libstdbuf{dylib_ext}"));

// Check multiple possible locations for the built library
let possible_paths = if !target.is_empty() && target != "unknown" {
Expand Down Expand Up @@ -162,7 +156,7 @@ fn main() {
.and_then(|p| p.parent())
.and_then(|p| p.parent())
{
let lib_filename = format!("libstdbuf{}", platform::DYLIB_EXT);
let lib_filename = format!("libstdbuf{dylib_ext}");
let source = target_dir.join("deps").join(&lib_filename);
let dest = target_dir.join(&lib_filename);

Expand Down
Loading