diff options
| author | bors <bors@rust-lang.org> | 2022-02-17 22:54:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-17 22:54:18 +0000 |
| commit | 73a7423e77b49a99e270531fbadda5b8899df3f6 (patch) | |
| tree | e8710d3ce418b53ef817c313b05d44020e523f14 /src/bootstrap | |
| parent | 30b3f35c420694a4f24e5a4df00f06073f4f3a37 (diff) | |
| parent | 39c17488fb9daca40f3fa8348409515660c594e4 (diff) | |
| download | rust-73a7423e77b49a99e270531fbadda5b8899df3f6.tar.gz rust-73a7423e77b49a99e270531fbadda5b8899df3f6.zip | |
Auto merge of #94103 - matthiaskrgr:rollup-cd70ofn, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #93337 (Update tracking issue numbers for inline assembly sub-features) - #93758 (Improve comments about type folding/visiting.) - #93780 (Generate list instead of div items in sidebar) - #93976 (Add MAIN_SEPARATOR_STR) - #94011 (Even more let_else adoptions) - #94041 (Add a `try_collect()` helper method to `Iterator`) - #94043 (Fix ICE when using Box<T, A> with pointer sized A) - #94082 (Remove CFG_PLATFORM) - #94085 (Clippy: Don't lint `needless_borrow` in method receiver positions) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/dist.rs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 013687ce377..029049d5434 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1877,12 +1877,6 @@ fn add_env(builder: &Builder<'_>, cmd: &mut Command, target: TargetSelection) { } else { cmd.env("CFG_MINGW", "0").env("CFG_ABI", "MSVC"); } - - if target.contains("x86_64") { - cmd.env("CFG_PLATFORM", "x64"); - } else { - cmd.env("CFG_PLATFORM", "x86"); - } } /// Maybe add LLVM object files to the given destination lib-dir. Allows either static or dynamic linking. |