admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

HOMEBREW_PROCESSOR is arm64 on Apple Silicon

Browse Source 
Utils::Bottles::tag: ARM tag is arm64_big_sur
This commit is contained in:
Shaun Jackman 2020-07-08 12:30:45 -07:00
parent e18027a1a8
commit 9a83e52ae4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/brew.sh
View File

@ -87,6 +87,7 @@ then
odie "Cowardly refusing to continue at this prefix: $HOMEBREW_PREFIX" odie "Cowardly refusing to continue at this prefix: $HOMEBREW_PREFIX"
fi fi
HOMEBREW_PROCESSOR="$(uname -m)"
HOMEBREW_SYSTEM="$(uname -s)" HOMEBREW_SYSTEM="$(uname -s)"
case "$HOMEBREW_SYSTEM" in case "$HOMEBREW_SYSTEM" in
Darwin) HOMEBREW_MACOS="1" ;; Darwin) HOMEBREW_MACOS="1" ;;
@ -119,11 +120,9 @@ fi
if [[ -n "$HOMEBREW_MACOS" ]] if [[ -n "$HOMEBREW_MACOS" ]]
then then
HOMEBREW_PROCESSOR="$(uname -p)"
HOMEBREW_PRODUCT="Homebrew" HOMEBREW_PRODUCT="Homebrew"
HOMEBREW_SYSTEM="Macintosh" HOMEBREW_SYSTEM="Macintosh"
# This is i386 even on x86_64 machines [[ "$HOMEBREW_PROCESSOR" = "x86_64" ]] && HOMEBREW_PROCESSOR="Intel"
[[ "$HOMEBREW_PROCESSOR" = "i386" ]] && HOMEBREW_PROCESSOR="Intel"
HOMEBREW_MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)" HOMEBREW_MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)"
HOMEBREW_OS_VERSION="macOS $HOMEBREW_MACOS_VERSION" HOMEBREW_OS_VERSION="macOS $HOMEBREW_MACOS_VERSION"
# Don't change this from Mac OS X to match what macOS itself does in Safari on 10.12 # Don't change this from Mac OS X to match what macOS itself does in Safari on 10.12
@ -166,7 +165,6 @@ then
HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH="1" HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH="1"
fi fi
else else
HOMEBREW_PROCESSOR="$(uname -m)"
HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew" HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew"
[[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)" [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)"
: "${HOMEBREW_OS_VERSION:=$(uname -r)}" : "${HOMEBREW_OS_VERSION:=$(uname -r)}"

2
Library/Homebrew/extend/os/mac/utils/bottles.rb
View File

@ -9,7 +9,7 @@ module Utils
if Hardware::CPU.intel? if Hardware::CPU.intel?
MacOS.version.to_sym MacOS.version.to_sym
else else
"#{ENV["HOMEBREW_PROCESSOR"]}_#{MacOS.version.to_sym}".to_sym "#{Hardware::CPU.arch}_#{MacOS.version.to_sym}".to_sym
end end
end end
end end