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

Merge pull request #10093 from MikeMcQuaid/rosetta2_install_error

Browse Source 
install: clarify "on Intel" error if under Rosetta 2.
This commit is contained in:
Mike McQuaid 2020-12-22 11:24:14 +00:00 committed by GitHub
commit b0d2a64b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/install.rb
View File

@ -30,8 +30,14 @@ module Homebrew
end end
def check_prefix def check_prefix
if Hardware::CPU.intel? && HOMEBREW_PREFIX.to_s == HOMEBREW_MACOS_ARM_DEFAULT_PREFIX if (Hardware::CPU.intel? || Hardware::CPU.in_rosetta2?) &&
odie "Cannot install in Homebrew on Intel processor in ARM default prefix (#{HOMEBREW_PREFIX})!" HOMEBREW_PREFIX.to_s == HOMEBREW_MACOS_ARM_DEFAULT_PREFIX
configuration = if Hardware::CPU.in_rosetta2?
"on Intel processor"
else
"under Rosetta 2"
end
odie "Cannot install in Homebrew #{configuration} in ARM default prefix (#{HOMEBREW_PREFIX})!"
elsif Hardware::CPU.arm? && HOMEBREW_PREFIX.to_s == HOMEBREW_DEFAULT_PREFIX elsif Hardware::CPU.arm? && HOMEBREW_PREFIX.to_s == HOMEBREW_DEFAULT_PREFIX
odie <<~EOS odie <<~EOS
Cannot install in Homebrew on ARM processor in Intel default prefix (#{HOMEBREW_PREFIX})! Cannot install in Homebrew on ARM processor in Intel default prefix (#{HOMEBREW_PREFIX})!