Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

install: add workaround for rosetta2 path error to msg #10319

Merged
merged 4 commits into from Jan 26, 2021
Merged

install: add workaround for rosetta2 path error to msg #10319

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b4fea6
install: add workaround for rosetta2 path error msg
dcow Jan 14, 2021
0562d0c
fixup: reword error message and remove pointless variable
dcow Jan 14, 2021
db52d6a
Update Library/Homebrew/install.rb
dcow Jan 25, 2021
786a06d
Library/Homebrew/install: fix whitespace.
MikeMcQuaid Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions Library/Homebrew/install.rb
View file
Open in desktop
Expand Up @@ -32,12 +32,16 @@ def perform_build_from_source_checks(all_fatal: false)
def check_prefix
if (Hardware::CPU.intel? || Hardware::CPU.in_rosetta2?) &&
HOMEBREW_PREFIX.to_s == HOMEBREW_MACOS_ARM_DEFAULT_PREFIX
configuration = if Hardware::CPU.in_rosetta2?
"under Rosetta 2"
if Hardware::CPU.in_rosetta2?
odie <<~EOS
Cannot install under Rosetta 2 in ARM default prefix (#{HOMEBREW_PREFIX})!
To rerun under ARM use:
arch -arm64 brew install ...
To install under x86_64, install Homebrew into #{HOMEBREW_DEFAULT_PREFIX}.
EOS
else
"on Intel processor"
odie "Cannot install on Intel processor in ARM default prefix (#{HOMEBREW_PREFIX})!"
end
odie "Cannot install in Homebrew #{configuration} in ARM default prefix (#{HOMEBREW_PREFIX})!"
elsif Hardware::CPU.arm? && HOMEBREW_PREFIX.to_s == HOMEBREW_DEFAULT_PREFIX
odie <<~EOS
Cannot install in Homebrew on ARM processor in Intel default prefix (#{HOMEBREW_PREFIX})!
Expand Down