From 00ffc137db5ae977575fb47fd06f60d5c5139491 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Thu, 2 Apr 2026 18:38:00 -0400 Subject: [PATCH 1/2] Update cargo submodule --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index 888f675344eb1..a357df4c26fc1 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 888f675344eb1cf2308fd53183e667bdd2c58e51 +Subproject commit a357df4c26fc14514e66aae2a269456b5545c7db From 34e410075de78c681c870580a0f3eb6452150d02 Mon Sep 17 00:00:00 2001 From: Arlo Siemsen Date: Mon, 6 Apr 2026 14:30:34 -0500 Subject: [PATCH 2/2] 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. --- src/bootstrap/src/core/builder/cargo.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs index b4ef00bd4ea0d..f785254d90dae 100644 --- a/src/bootstrap/src/core/builder/cargo.rs +++ b/src/bootstrap/src/core/builder/cargo.rs @@ -566,6 +566,7 @@ impl Builder<'_> { if !has_modern_jobserver { cargo.env_remove("MAKEFLAGS"); + cargo.env_remove("MFLAGS"); } cargo