about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Nethercote <nnethercote@mozilla.com>2018-12-12 16:28:43 +1100
committerNicholas Nethercote <nnethercote@mozilla.com>2018-12-12 16:30:06 +1100
commit209240dc267075d69eb8d1dba23be2a8c80c6427 (patch)
tree4de7a613683006e866c4e51351e46ec6ff9e025a
parent95a6262df18d8eb474efab273717dee25e79738e (diff)
downloadrust-209240dc267075d69eb8d1dba23be2a8c80c6427.tar.gz
rust-209240dc267075d69eb8d1dba23be2a8c80c6427.zip
Remove some env vars for rustdoc invocations.
In an attempt to avoid "thread '<unnamed>' panicked at 'failed to
acquire jobserver token: Bad file descriptor" errors.
-rw-r--r--src/bootstrap/builder.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 7dc64db70b8..32f3e573d68 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -684,6 +684,11 @@ impl<'a> Builder<'a> {
             .env("RUSTDOC_REAL", self.rustdoc(host))
             .env("RUSTDOC_CRATE_VERSION", self.rust_version())
             .env("RUSTC_BOOTSTRAP", "1");
+
+        // Remove make-related flags that can cause jobserver problems.
+        cmd.env_remove("MAKEFLAGS");
+        cmd.env_remove("MFLAGS");
+
         if let Some(linker) = self.linker(host) {
             cmd.env("RUSTC_TARGET_LINKER", linker);
         }