diff options
| author | bors <bors@rust-lang.org> | 2020-11-18 10:39:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-18 10:39:02 +0000 |
| commit | 7d747db0d5dd8f08f2efb073e2e77a34553465a7 (patch) | |
| tree | ece8318a8316c924b23b0e64494cea0fce8424ac /src/bootstrap | |
| parent | c4f836ad1aceb83507810d9499f56988fd24578d (diff) | |
| parent | 3853c0c9fca0718f4b9269dd45b3fdd22a6cc819 (diff) | |
| download | rust-7d747db0d5dd8f08f2efb073e2e77a34553465a7.tar.gz rust-7d747db0d5dd8f08f2efb073e2e77a34553465a7.zip | |
Auto merge of #79159 - pietroalbini:woops, r=pietroalbini
Revert #79132 The beta promotion release was mistakenly landed on master instead of beta. Ugh. r? `@ghost` cc `@rust-lang/release`
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/dist.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 29fccc0533b..9b77e38a847 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1336,13 +1336,7 @@ impl Step for Rls { let rls = builder .ensure(tool::Rls { compiler, target, extra_features: Vec::new() }) .or_else(|| { - // We ignore failure on aarch64 Windows because RLS currently - // fails to build, due to winapi 0.2 not supporting aarch64. - missing_tool( - "RLS", - builder.build.config.missing_tools - || (target.triple.contains("aarch64") && target.triple.contains("windows")), - ); + missing_tool("RLS", builder.build.config.missing_tools); None })?; |