Skip to content

Commit 9a9e548

Browse files
committed
Improve cleanliness of test make invocations
Add --version argument and change spawn() to output().
1 parent 6e053a7 commit 9a9e548

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,9 @@ impl Config {
310310
// If make.exe isn't found, that means we may be using a MinGW
311311
// toolchain instead of a MSYS2 toolchain. If neither is found,
312312
// the build cannot continue.
313-
let has_msys2 = Command::new("make").spawn().err()
313+
let has_msys2 = Command::new("make").arg("--version").output().err()
314314
.map(|e| e.kind() != ErrorKind::NotFound).unwrap_or(true);
315-
let has_mingw32 = Command::new("mingw32-make").spawn().err()
315+
let has_mingw32 = Command::new("mingw32-make").arg("--version").output().err()
316316
.map(|e| e.kind() != ErrorKind::NotFound).unwrap_or(true);
317317

318318
let generator = match (has_msys2, has_mingw32) {

0 commit comments

Comments
 (0)