Miscellaneous changes #266

Merged
lucas merged 49 commits from feat/misc into master 2025-07-02 16:25:44 +02:00
2 changed files with 8 additions and 7 deletions
Showing only changes of commit 71051a384b - Show all commits

View file

@ -19,7 +19,7 @@ bincode = "2.0.0"
bindgen = "0.70.1" bindgen = "0.70.1"
bitflags = "2.5.0" bitflags = "2.5.0"
byteorder = "1.4.3" byteorder = "1.4.3"
cc = "1.2.27" cc = { version = "1.2.27", features = ["parallel"] }
clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "string", "unicode"] } clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "string", "unicode"] }
cli-table = { version = "0.5.0", default-features = false, features = ["derive"] } cli-table = { version = "0.5.0", default-features = false, features = ["derive"] }
color-eyre = { path = "lib/color-eyre" } color-eyre = { path = "lib/color-eyre" }

View file

@ -82,6 +82,11 @@ const LUAJIT_SRC: [&str; 65] = [
fn build_gcc(src_dir: &str) { fn build_gcc(src_dir: &str) {
let mut buildcmd = Command::new("make"); let mut buildcmd = Command::new("make");
if let Ok(flags) = env::var("CARGO_MAKEFLAGS") {
buildcmd.env("MAKEFLAGS", flags);
} else {
buildcmd.arg("-j8");
}
buildcmd.current_dir(src_dir); buildcmd.current_dir(src_dir);
buildcmd.stderr(Stdio::inherit()); buildcmd.stderr(Stdio::inherit());
buildcmd.arg("--no-silent"); buildcmd.arg("--no-silent");
@ -102,14 +107,10 @@ fn build_gcc(src_dir: &str) {
let mut child = buildcmd.spawn().expect("failed to run make"); let mut child = buildcmd.spawn().expect("failed to run make");
if !child child
.wait() .wait()
.map(|status| status.success()) .map(|status| status.success())
.map_err(|_| false) .expect("Failed to build LuaJIT");
.unwrap_or(false)
{
panic!("Failed to build luajit");
}
} }
fn build_msvc(src_dir: &str, out_dir: &str) { fn build_msvc(src_dir: &str, out_dir: &str) {