Skip to content

Commit 9bc9b88

Browse files
committed
Set the -j flag in make flags on all platforms
For some reason, it's only set on Unix, not Windows, but some versions of GNU make will complain about "-jN forced in submake" when _no_ -j flag is given at all, and disable the jobserver mode entirely.
1 parent e6701fe commit 9bc9b88

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ impl Client {
294294
// Older implementations of make use `--jobserver-fds` and newer
295295
// implementations use `--jobserver-auth`, pass both to try to catch
296296
// both implementations.
297-
let value = format!("--jobserver-fds={0} --jobserver-auth={0}", arg);
297+
let value = format!("-j --jobserver-fds={0} --jobserver-auth={0}", arg);
298298
cmd.env("CARGO_MAKEFLAGS", &value);
299299
self.inner.configure(cmd);
300300
}

src/unix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl Client {
184184
}
185185

186186
pub fn string_arg(&self) -> String {
187-
format!("{},{} -j", self.read.as_raw_fd(), self.write.as_raw_fd())
187+
format!("{},{}", self.read.as_raw_fd(), self.write.as_raw_fd())
188188
}
189189

190190
pub fn configure(&self, cmd: &mut Command) {

0 commit comments

Comments
 (0)