diff options
| author | bors <bors@rust-lang.org> | 2022-05-22 16:47:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-22 16:47:17 +0000 |
| commit | 0a437b2ca081bc12425a3318cb66aade9824cbae (patch) | |
| tree | e5bb27cf96f011cdd4f12b3fbc5471bb1241875d /src/bootstrap/bootstrap.py | |
| parent | 4bb4dc4672b4d80509db4c0572ae8ceeaf7d4a1c (diff) | |
| parent | b392cdf7de4cd8413f24ce77bf04dd646a60d79d (diff) | |
| download | rust-0a437b2ca081bc12425a3318cb66aade9824cbae.tar.gz rust-0a437b2ca081bc12425a3318cb66aade9824cbae.zip | |
Auto merge of #97283 - jackh726:rollup-ga84p7n, r=jackh726
Rollup of 5 pull requests Successful merges: - #97043 (Move some tests to more reasonable directories) - #97206 (Do leak check after function pointer coercion) - #97275 (small change) - #97277 (Avoid accidentally enabling unstable features in compilers (take 2)) - #97280 (Quote replace target in bootstrap configure) Failed merges: - #97214 (Finish bumping stage0) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index d36344ece4e..6d46ea26e6a 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1192,7 +1192,6 @@ def bootstrap(help_triggered): env = os.environ.copy() env["BOOTSTRAP_PARENT_ID"] = str(os.getpid()) env["BOOTSTRAP_PYTHON"] = sys.executable - env["RUSTC_BOOTSTRAP"] = '1' if build.rustc_commit is not None: env["BOOTSTRAP_DOWNLOAD_RUSTC"] = '1' run(args, env=env, verbose=build.verbose, is_bootstrap=True) |