Merge pull request #10094 from MikeMcQuaid/install-rosetta-arm

install: switch Rosetta 2/Intel messaging order.
This commit is contained in:
Mike McQuaid 2020-12-22 12:14:07 +00:00 committed by GitHub
commit b0dd137cdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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