From 89d610cd06f90cd6bd0bccdb395a3127290e1b45 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Sun, 8 Oct 2023 13:41:56 +0300
Subject: [PATCH] Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap
compilation
Note that RUSTFLAGS_BOOTSTRAP should always be added to the end of
RUSTFLAGS to be actually effective (e.g., if we have `-Dwarnings` in
RUSTFLAGS, passing `-Awarnings` from RUSTFLAGS_BOOTSTRAP should override it).
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/bootstrap.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 4af97b2f466d3..1a1125a107fe1 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -954,6 +954,13 @@ def build_bootstrap_cmd(self, env):
if deny_warnings:
env["RUSTFLAGS"] += " -Dwarnings"
+ # Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap compilation.
+ # Note that RUSTFLAGS_BOOTSTRAP should always be added to the end of
+ # RUSTFLAGS to be actually effective (e.g., if we have `-Dwarnings` in
+ # RUSTFLAGS, passing `-Awarnings` from RUSTFLAGS_BOOTSTRAP should override it).
+ if "RUSTFLAGS_BOOTSTRAP" in env:
+ env["RUSTFLAGS"] += " " + env["RUSTFLAGS_BOOTSTRAP"]
+
env["PATH"] = os.path.join(self.bin_root(), "bin") + \
os.pathsep + env["PATH"]
if not os.path.isfile(self.cargo()):