PublicArchive/uutils-coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-05-06 07:26:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

stdbuf: support cross-platform building (#11609)

Browse Source 
This PR fixes e.g. building Android targets on Windows.

Because `build.rs` uses `#[cfg]` to determine, the suffix of the platform to be built cannot be correctly determined during cross-platform building.

After changing from `#[cfg]` to `env::var`, `feat_os_unix_android`, which includes `stdbuf`, can be compiled normally. There is no actual test for other cross-platform compilation scenarios, but in theory it can be used normally.

Co-authored-by: 白彩恋 <169267914+shirorren@users.noreply.github.com>
This commit is contained in:
夢璃酱
2026-04-12 05:18:12 +08:00
committed by GitHub
parent 56210f1137
commit affce7094b
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/stdbuf/build.rs
+23 -29
View File
@@ -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");
@@ -58,6 +36,21 @@ 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");
@@ -65,7 +58,7 @@ fn main() {
// 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
@@ -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" {
@@ -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);