encounter
/
objdiff
mirror of https://github.com/encounter/objdiff.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on not(windows)

This commit is contained in:
Luke Street 2022-09-11 20:36:13 -04:00
parent daaa5c86a2
commit 7bcbfd7bc0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jobs/build.rs
View File

@ -2,7 +2,7 @@ use std::{
path::Path, path::Path,
process::Command, process::Command,
str::from_utf8, str::from_utf8,
sync::{Arc, mpsc::Receiver, RwLock}, sync::{mpsc::Receiver, Arc, RwLock},
}; };
use anyhow::{Context, Error, Result}; use anyhow::{Context, Error, Result};
@ -11,7 +11,7 @@ use crate::{
app::AppConfig, app::AppConfig,
diff::diff_objs, diff::diff_objs,
elf, elf,
jobs::{Job, JobResult, JobState, queue_job, Status, update_status}, jobs::{queue_job, update_status, Job, JobResult, JobState, Status},
obj::ObjInfo, obj::ObjInfo,
}; };
@ -30,7 +30,11 @@ fn run_make(cwd: &Path, arg: &Path, config: &AppConfig) -> BuildStatus {
match (|| -> Result<BuildStatus> { match (|| -> Result<BuildStatus> {
let make = if config.custom_make.is_empty() { "make" } else { &config.custom_make }; let make = if config.custom_make.is_empty() { "make" } else { &config.custom_make };
#[cfg(not(windows))] #[cfg(not(windows))]
let mut command = Command::new(make).current_dir(cwd).arg(arg); {
let mut command = Command::new(make);
command.current_dir(cwd).arg(arg);
command
}
#[cfg(windows)] #[cfg(windows)]
let mut command = { let mut command = {
use path_slash::PathExt; use path_slash::PathExt;