From 4857bb7ffa7d83af4caff0a3571772c45fc8c76d Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 15 Sep 2017 09:40:35 -0700 Subject: [PATCH] rustbuild: Don't pass `-j` if called by `make` In these situations Cargo just prints out a warning about ignoring the flag anyway, so let `make` take care of jobs and whatnot instead of getting warnings printed. --- src/bootstrap/builder.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 4765546b184..01213625ecd 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -8,15 +8,16 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use std::any::Any; +use std::cell::RefCell; +use std::collections::BTreeSet; +use std::env; use std::fmt::Debug; +use std::fs; use std::hash::Hash; -use std::cell::RefCell; +use std::ops::Deref; use std::path::{Path, PathBuf}; use std::process::Command; -use std::fs; -use std::ops::Deref; -use std::any::Any; -use std::collections::BTreeSet; use compile; use install; @@ -437,9 +438,14 @@ pub fn cargo(&self, let out_dir = self.stage_out(compiler, mode); cargo.env("CARGO_TARGET_DIR", out_dir) .arg(cmd) - .arg("-j").arg(self.jobs().to_string()) .arg("--target").arg(target); + // If we were invoked from `make` then that's already got a jobserver + // set up for us so no need to tell Cargo about jobs all over again. + if env::var_os("MAKEFLAGS").is_none() && env::var_os("MFLAGS").is_none() { + cargo.arg("-j").arg(self.jobs().to_string()); + } + // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005 // Force cargo to output binaries with disambiguating hashes in the name cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel); -- 2.44.0