View | Details | Raw Unified | Return to bug 228373 | Differences between
and this patch

Collapse All | Expand All

(-)src/bootstrap/builder.rs (-5 / +1 lines)
Lines 534-544 impl<'a> Builder<'a> { Link Here
534
             .arg("--target")
534
             .arg("--target")
535
             .arg(target);
535
             .arg(target);
536
536
537
        // If we were invoked from `make` then that's already got a jobserver
537
        cargo.arg("-j").arg(self.jobs().to_string());
538
        // set up for us so no need to tell Cargo about jobs all over again.
539
        if env::var_os("MAKEFLAGS").is_none() && env::var_os("MFLAGS").is_none() {
540
             cargo.arg("-j").arg(self.jobs().to_string());
541
        }
542
538
543
        // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
539
        // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
544
        // Force cargo to output binaries with disambiguating hashes in the name
540
        // Force cargo to output binaries with disambiguating hashes in the name

Return to bug 228373