Skip to content

Added macOS arm64 support #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbracken merged 3 commits into from
May 11, 2022
Merged

Added macOS arm64 support #39

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3af6f34
Added macOS arm64 support
Rexios80 May 10, 2022
9be9b42
Use arm64 in place of M1 and update comments
cbracken May 11, 2022
65052a5
Support downloading Dartium on arm64 Macs
cbracken May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use arm64 in place of M1 and update comments 
Pedantic tweak to use the term arm64 in place of M1, since presumably
(hopefully) we'll see further iterations of Apple Silicon Macs such as
M2, etc.

Added a bit more detail to the doc comments for both the SDK
architecture selection function and the Dartium architecture selection
function.
  • Loading branch information
@cbracken
cbracken committed May 11, 2022
commit 9be9b4271f92ba57798eb32846f1122df90b4e1c
15 changes: 10 additions & 5 deletions scripts/dvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,11 @@ _dvm_download_dartium() {
}

# Returns the CPU architechture for Dart in the specified SDK version.
_macos_m1_dart_arch() {
# SDKs >= 2.14.1 are compiled for arm64.
#
# Used by Apple Silicon (arm64) based Macs to determine the architecture of the
# Dart SDK archive to download. For SDK 2.14.1 and later, download the arm64
# bundle. Prior to that, only Intel binaries are available.
_macos_arm64_sdk_arch() {
local archBoundary="2.14.1"
if [[ "$1" == "latest" || "$(printf "$1\n$archBoundary\n" | sort -t. -n -k 1,1 -k 2,2 -k 3,3 | head -n1)" == "$archBoundary" ]]; then
echo "arm64"
Expand All @@ -254,9 +257,11 @@ _macos_m1_dart_arch() {
}

# Returns the CPU architechture for Dartium in the specified SDK version.
#
# In Dart SDKx 1.19.x and earlier, Dartium shipped only as an ia32 build. In
# SDKs later than 1.20.0, it was produced as an x64 build. Through a happy
# quirk of fate, 1.20.0 never existed.
_macos_dartium_arch() {
# SDKs <= 1.19.x are ia32, > 1.20.0 are x64.
# Through a happy quirk of fate, 1.20.0 never existed.
local archBoundary="1.20.0"
if [[ "$1" == "latest" || "$(printf "$1\n$archBoundary\n" | sort -t. -n -k 1,1 -k 2,2 -k 3,3 | head -n1)" == "$archBoundary" ]]; then
echo "x64"
Expand Down Expand Up @@ -287,7 +292,7 @@ dvm_install() {

case $(uname -a) in
Darwin*arm64*)
local arch="$(_macos_m1_dart_arch "$version")"
local arch="$(_macos_arm64_sdk_arch "$version")"
local sdk_archive="dartsdk-macos-$arch-release.zip"
# M1 users probably won't be using dartium or the content shell
;;
Expand Down