feat: update depot version to 0.5.0 and enhance build directory handling for lib32
This commit is contained in:
Generated
+1
-1
@@ -435,7 +435,7 @@ checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "depot"
|
name = "depot"
|
||||||
version = "0.1.0"
|
version = "0.5.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"ar",
|
"ar",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "depot"
|
name = "depot"
|
||||||
version = "0.1.0"
|
version = "0.5.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[lints.rust]
|
[lints.rust]
|
||||||
|
|||||||
@@ -21,7 +21,11 @@ pub fn build(
|
|||||||
// Determine actual source directory (support source_subdir)
|
// Determine actual source directory (support source_subdir)
|
||||||
let actual_src = resolve_actual_src(spec, src_dir)?;
|
let actual_src = resolve_actual_src(spec, src_dir)?;
|
||||||
|
|
||||||
let build_dir = actual_src.join("build");
|
let build_dir = if let Some(dir) = &flags.build_dir {
|
||||||
|
actual_src.join(dir)
|
||||||
|
} else {
|
||||||
|
actual_src.join("build")
|
||||||
|
};
|
||||||
|
|
||||||
// Create directories
|
// Create directories
|
||||||
fs::create_dir_all(&build_dir)?;
|
fs::create_dir_all(&build_dir)?;
|
||||||
|
|||||||
@@ -97,6 +97,10 @@ fn make_lib32_build_spec(base: &package::PackageSpec) -> package::PackageSpec {
|
|||||||
|
|
||||||
flags.cc = format!("{} -m32", flags.cc.trim());
|
flags.cc = format!("{} -m32", flags.cc.trim());
|
||||||
flags.cxx = format!("{} -m32", flags.cxx.trim());
|
flags.cxx = format!("{} -m32", flags.cxx.trim());
|
||||||
|
flags.build_dir = Some(match flags.build_dir.as_deref() {
|
||||||
|
Some(dir) if !dir.trim().is_empty() => format!("{}-lib32", dir.trim()),
|
||||||
|
_ => "build-lib32".to_string(),
|
||||||
|
});
|
||||||
|
|
||||||
spec
|
spec
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user