From 970b2c770010c044abe5e3a8433fffc4ab3b8d52 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Fri, 24 Nov 2023 21:34:29 +0100
Subject: [PATCH] Fix `build_sysroot` by adding missing `RUSTFLAGS` environment
 variable

---
 build_system/src/build.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build_system/src/build.rs b/build_system/src/build.rs
index 3087a5d79e01..da29e87c33cb 100644
--- a/build_system/src/build.rs
+++ b/build_system/src/build.rs
@@ -141,8 +141,8 @@ fn build_sysroot_inner(
         rustflags.push_str(" -Cpanic=abort -Zpanic-abort-tests");
     }
     rustflags.push_str(" -Z force-unstable-if-unmarked");
+    let mut env = env.clone();
     let channel = if sysroot_release_channel {
-        let mut env = env.clone();
         env.insert(
             "RUSTFLAGS".to_string(),
             format!("{} -Zmir-opt-level=3", rustflags),
@@ -160,10 +160,15 @@ fn build_sysroot_inner(
         )?;
         "release"
     } else {
+        env.insert(
+            "RUSTFLAGS".to_string(),
+            rustflags,
+        );
+
         run_command_with_output_and_env(
             &[&"cargo", &"build", &"--target", &config.target],
             Some(start_dir),
-            Some(env),
+            Some(&env),
         )?;
         "debug"
     };