diff options
| author | bors <bors@rust-lang.org> | 2023-10-09 17:14:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-09 17:14:17 +0000 |
| commit | cdddcd3bea35049dab56888d4391cb9b5b1b4491 (patch) | |
| tree | 2af906f407e7596a36afe74047017623a03225e5 | |
| parent | 317783ad2c128037ab1ab7722fa3fa61a9e481a5 (diff) | |
| parent | 89d610cd06f90cd6bd0bccdb395a3127290e1b45 (diff) | |
| download | rust-cdddcd3bea35049dab56888d4391cb9b5b1b4491.tar.gz rust-cdddcd3bea35049dab56888d4391cb9b5b1b4491.zip | |
Auto merge of #116532 - onur-ozkan:enable-rustflags-bootstrap-on-bootstrap, r=albertlarsan68
Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap compilation Adds `RUSTFLAGS_BOOTSTRAP` to `RUSTFLAGS` for bootstrap compilation when `RUSTFLAGS_BOOTSTRAP` exists in the environment. With this PR, `RUSTFLAGS_BOOTSTRAP` will affect every build(as we already do for rustc and std) compiled with stage0 compiler. Resolves #94234
| -rw-r--r-- | src/bootstrap/bootstrap.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 4af97b2f466..1a1125a107f 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -954,6 +954,13 @@ class RustBuild(object): 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()): |