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

install: switch Rosetta 2/Intel messaging order.

Browse Source
This commit is contained in:
Mike McQuaid 2020-12-22 11:28:45 +00:00
parent b0d2a64b31
commit abb4038db0
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/install.rb
View File

@ -33,9 +33,9 @@ module Homebrew
if (Hardware::CPU.intel? || Hardware::CPU.in_rosetta2?) && if (Hardware::CPU.intel? || Hardware::CPU.in_rosetta2?) &&
HOMEBREW_PREFIX.to_s == HOMEBREW_MACOS_ARM_DEFAULT_PREFIX HOMEBREW_PREFIX.to_s == HOMEBREW_MACOS_ARM_DEFAULT_PREFIX
configuration = if Hardware::CPU.in_rosetta2? configuration = if Hardware::CPU.in_rosetta2?
"on Intel processor"
else
"under Rosetta 2" "under Rosetta 2"
else
"on Intel processor"
end end
odie "Cannot install in Homebrew #{configuration} in ARM default prefix (#{HOMEBREW_PREFIX})!" 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