@@ -21,20 +21,20 @@ use std::path::{Path, PathBuf};
2121use std:: process:: Command ;
2222use std:: time:: { Duration , Instant } ;
2323
24- use cache:: { Cache , Interned , INTERNER } ;
25- use check;
26- use compile;
27- use dist;
28- use doc;
29- use flags:: Subcommand ;
30- use install;
31- use native;
32- use test;
33- use tool;
34- use util:: { add_lib_path, exe, libdir} ;
35- use { Build , DocTests , Mode , GitRepo } ;
36-
37- pub use Compiler ;
24+ use crate :: cache:: { Cache , Interned , INTERNER } ;
25+ use crate :: check;
26+ use crate :: compile;
27+ use crate :: dist;
28+ use crate :: doc;
29+ use crate :: flags:: Subcommand ;
30+ use crate :: install;
31+ use crate :: native;
32+ use crate :: test;
33+ use crate :: tool;
34+ use crate :: util:: { add_lib_path, exe, libdir} ;
35+ use crate :: { Build , DocTests , Mode , GitRepo } ;
36+
37+ pub use crate :: Compiler ;
3838
3939use petgraph:: graph:: NodeIndex ;
4040use petgraph:: Graph ;
@@ -389,7 +389,6 @@ impl<'a> Builder<'a> {
389389 test:: UiFullDeps ,
390390 test:: RunPassFullDeps ,
391391 test:: RunFailFullDeps ,
392- test:: CompileFailFullDeps ,
393392 test:: Rustdoc ,
394393 test:: Pretty ,
395394 test:: RunPassPretty ,
@@ -417,6 +416,7 @@ impl<'a> Builder<'a> {
417416 test:: Rustfmt ,
418417 test:: Miri ,
419418 test:: Clippy ,
419+ test:: CompiletestTest ,
420420 test:: RustdocJS ,
421421 test:: RustdocTheme ,
422422 // Run bootstrap close to the end as it's unlikely to fail
@@ -685,6 +685,11 @@ impl<'a> Builder<'a> {
685685 . env ( "RUSTDOC_REAL" , self . rustdoc ( host) )
686686 . env ( "RUSTDOC_CRATE_VERSION" , self . rust_version ( ) )
687687 . env ( "RUSTC_BOOTSTRAP" , "1" ) ;
688+
689+ // Remove make-related flags that can cause jobserver problems.
690+ cmd. env_remove ( "MAKEFLAGS" ) ;
691+ cmd. env_remove ( "MFLAGS" ) ;
692+
688693 if let Some ( linker) = self . linker ( host) {
689694 cmd. env ( "RUSTC_TARGET_LINKER" , linker) ;
690695 }
@@ -793,7 +798,7 @@ impl<'a> Builder<'a> {
793798 }
794799
795800 // Set a flag for `check` so that certain build scripts can do less work
796- // (e.g. not building/requiring LLVM).
801+ // (e.g., not building/requiring LLVM).
797802 if cmd == "check" {
798803 cargo. env ( "RUST_CHECK" , "1" ) ;
799804 }
@@ -923,12 +928,12 @@ impl<'a> Builder<'a> {
923928 cargo. env ( "RUSTC_FORCE_UNSTABLE" , "1" ) ;
924929
925930 // Currently the compiler depends on crates from crates.io, and
926- // then other crates can depend on the compiler (e.g. proc-macro
931+ // then other crates can depend on the compiler (e.g., proc-macro
927932 // crates). Let's say, for example that rustc itself depends on the
928933 // bitflags crate. If an external crate then depends on the
929934 // bitflags crate as well, we need to make sure they don't
930935 // conflict, even if they pick the same version of bitflags. We'll
931- // want to make sure that e.g. a plugin and rustc each get their
936+ // want to make sure that e.g., a plugin and rustc each get their
932937 // own copy of bitflags.
933938
934939 // Cargo ensures that this works in general through the -C metadata
@@ -1247,7 +1252,7 @@ impl<'a> Builder<'a> {
12471252#[ cfg( test) ]
12481253mod __test {
12491254 use super :: * ;
1250- use config:: Config ;
1255+ use crate :: config:: Config ;
12511256 use std:: thread;
12521257
12531258 fn configure ( host : & [ & str ] , target : & [ & str ] ) -> Config {
0 commit comments