Merge pull request #701 from JuliaLang/sk/macos-uname-lies

MacOS `uname -m` can lie due to Rosetta shenanigans

deploy/shellscript/juliaup-init.sh

@@ -217,10 +217,19 @@ get_architecture() {
  _clibtype="musl"
  fi
 
- if [ "$_ostype" = Darwin ] && [ "$_cputype" = i386 ]; then
- # Darwin `uname -m` lies
- if sysctl hw.optional.x86_64 | grep -q ': 1'; then
- _cputype=x86_64
+ if [ "$_ostype" = Darwin ]; then
+ # Darwin `uname -m` can lie due to Rosetta shenanigans. If you manage to
+ # invoke a native shell binary and then a native uname binary, you can
+ # get the real answer, but that's hard to ensure, so instead we use
+ # `sysctl` (which doesn't lie) to check for the actual architecture.
+ if [ "$_cputype" = i386 ]; then
+ if sysctl hw.optional.x86_64 | grep -q ': 1'; then
+ _cputype=x86_64
+ fi
+ elif [ "$_cputype" = x86_64 ]; then
+ if sysctl hw.optional.arm64 | grep -q ': 1'; then
+ _cputype=arm64
+ fi
  fi
  fi