diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-21 19:40:38 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-21 19:40:38 +0000 |
commit | ba71685343ccdca9de3899d2ae634aaa8185c359 (patch) | |
tree | f09f89d5d51f47f1bfd6cc31c551597f14fe6681 | |
parent | 4c8a641f726b693f23943b184179e1be3a885313 (diff) | |
parent | 211551646f7b215980b45917fe61b0d901d73682 (diff) |
Merge #6991
6991: Don't download x64 binaries on non-Mac arm64 r=lnicola a=lnicola
bors r+
Co-authored-by: Laurențiu Nicola <[email protected]>
-rw-r--r-- | editors/code/src/main.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 6f196c7b8..4b2d3c8a5 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts | |||
@@ -287,10 +287,12 @@ async function getServer(config: Config, state: PersistentState): Promise<string | |||
287 | if (config.package.releaseTag === null) return "rust-analyzer"; | 287 | if (config.package.releaseTag === null) return "rust-analyzer"; |
288 | 288 | ||
289 | let platform: string | undefined; | 289 | let platform: string | undefined; |
290 | if (process.arch === "x64" || process.arch === "ia32" || process.arch === "arm64") { | 290 | if (process.arch === "x64" || process.arch === "ia32") { |
291 | if (process.platform === "linux") platform = "linux"; | 291 | if (process.platform === "linux") platform = "linux"; |
292 | if (process.platform === "darwin") platform = "mac"; | 292 | if (process.platform === "darwin") platform = "mac"; |
293 | if (process.platform === "win32") platform = "windows"; | 293 | if (process.platform === "win32") platform = "windows"; |
294 | } else if (process.arch === "arm64" && process.platform === "darwin") { | ||
295 | platform = "mac"; | ||
294 | } | 296 | } |
295 | if (platform === undefined) { | 297 | if (platform === undefined) { |
296 | vscode.window.showErrorMessage( | 298 | vscode.window.showErrorMessage( |