Skip to content

Commit

Permalink
[release/homebrew] Always use x64 binaries on macOS
Browse files Browse the repository at this point in the history
We no longer support ia32 Macs (see linked issue).

Bug: dart-lang/sdk#39810
Change-Id: I5fc6ab6a9074e54a90e8480d0ede416a237733cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/130360
Reviewed-by: William Hesse <[email protected]>
  • Loading branch information
athomas committed Jun 4, 2021
1 parent 5f8182e commit 16e546e
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions lib/src/impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const _x64Files = {
'linux-arm': 'sdk/dartsdk-linux-arm64-release.zip',
};
const _ia32Files = {
'mac': 'sdk/dartsdk-macos-ia32-release.zip',
'linux': 'sdk/dartsdk-linux-ia32-release.zip',
'linux-arm': 'sdk/dartsdk-linux-arm-release.zip',
};
Expand Down Expand Up @@ -93,13 +92,8 @@ class Dart < Formula
version "$stableVersion"
if OS.mac?
if Hardware::CPU.is_64_bit?
url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['mac']}"
sha256 "${hashes['stable'][_x64Files['mac']]}"
else
url "$_urlBase/stable/release/${revisions['stable']}/${_ia32Files['mac']}"
sha256 "${hashes['stable'][_ia32Files['mac']]}"
end
url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['mac']}"
sha256 "${hashes['stable'][_x64Files['mac']]}"
elsif OS.linux? && Hardware::CPU.intel?
if Hardware::CPU.is_64_bit?
url "$_urlBase/stable/release/${revisions['stable']}/${_x64Files['linux']}"
Expand All @@ -121,13 +115,8 @@ class Dart < Formula
devel do
version "$devVersion"
if OS.mac?
if Hardware::CPU.is_64_bit?
url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['mac']}"
sha256 "${hashes['dev'][_x64Files['mac']]}"
else
url "$_urlBase/dev/release/${revisions['dev']}/${_ia32Files['mac']}"
sha256 "${hashes['dev'][_ia32Files['mac']]}"
end
url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['mac']}"
sha256 "${hashes['dev'][_x64Files['mac']]}"
elsif OS.linux? && Hardware::CPU.intel?
if Hardware::CPU.is_64_bit?
url "$_urlBase/dev/release/${revisions['dev']}/${_x64Files['linux']}"
Expand Down

0 comments on commit 16e546e

Please sign in to comment.