Skip to content

Commit 34e4100

Browse files
committed
fix(bootstrap): also unset MFLAGS when fifo jobserver not present
CI jobs were sometimes hanging because cargo would inherit the jobserver based the MFLAGS environment variable when it contained file descriptors. However, these FDs were not valid, since bootstrap.py does not pass them through from make. This leads cargo's job server to use invalid FDs when setting up the jobserver. Bootstrap had a mitigation for this when it came from MAKEFLAGS, but not when it came from MFLAGS.
1 parent 00ffc13 commit 34e4100

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

src/bootstrap/src/core/builder/cargo.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ impl Builder<'_> {
566566

567567
if !has_modern_jobserver {
568568
cargo.env_remove("MAKEFLAGS");
569+
cargo.env_remove("MFLAGS");
569570
}
570571

571572
cargo

0 commit comments

Comments
 (0)