Skip to content

Commit 626c8a3

Browse files
committed
Add prefix after all configure arguments
1 parent 1823431 commit 626c8a3

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "sccmod"
33
authors = ["Toby Davis \"Pencilcaseman\""]
4-
version = "0.3.2"
4+
version = "0.3.3"
55
edition = "2021"
66
readme = "README.md"
77
license = "MIT OR Apache-2.0"

src/builders/make.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,18 @@ impl Make {
3737
shell.add_command(&format!("module load {dep}"));
3838
}
3939

40-
let mut configure_cmd = format!("{source_path:?}/configure --prefix={install_path:?}");
40+
let mut configure_cmd = format!("{source_path:?}/configure");
4141

4242
if let Some(flags) = &self.configure_flags {
4343
for flag in flags {
4444
configure_cmd.push_str(&format!(" {flag}"));
4545
}
4646
}
4747

48-
shell.add_command(&configure_cmd);
49-
50-
// configure.stdout(std::process::Stdio::piped());
51-
// configure.stderr(std::process::Stdio::piped());
48+
// Add this last so it overrides anything passed in `configure_flags`
49+
configure_cmd.push_str(&format!("--prefix={install_path:?}"));
5250

53-
// let spawn = configure.spawn().map_err(|e| e.to_string())?;
54-
// let (result, stdout, stderr) = child_logger(spawn);
55-
56-
// if result.is_err() {
57-
// return Err("Failed to run ./configure".to_string());
58-
// }
59-
// let result = result.unwrap();
51+
shell.add_command(&configure_cmd);
6052

6153
let (result, stdout, stderr) = shell.exec();
6254
let result = result.map_err(|_| "Failed to run ./configure")?;

0 commit comments

Comments
 (0)