vendor-install: handle native ARM running under Rosetta #12417
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since `HOMEBREW_PROCESSOR` is populated using `uname -m`, this will
register as `Intel` even when a native ARM install is running under
Rosetta.
Let's work around this by checking `sysctl -n machdep.cpu.brand_string`.
On my Intel machine:
❯ sysctl -n machdep.cpu.brand_string
Intel(R) Core(TM) i3-1000NG4 CPU @ 1.10GHz
On Apple Silicon:
brew@HMBRW-A-001-M1-001 ~ % sysctl -n machdep.cpu.brand_string
Apple M1
The case of a Rosetta installation of Homebrew is already handled below
the proposed change.
Fixes Homebrew/discussions#2434.
carlocab
added
the
critical
|
Review period skipped due to |
BrewTestBot
approved these changes
Nov 11, 2021
carlocab
referenced
this pull request
Nov 11, 2021
The previous commit only prevented the installation of an Intel Portable Ruby into `/opt/homebrew` prefix. Let's actually install an ARM64 Portable Ruby there too.
Whenever the `sysctl` call does not match `"Apple"*`, we can be sure that `HOMEBREW_PROCESSOR` is `Intel`, so there's no need for this additional check.
This condition is always true when we've reached this branch.
carlocab
commented
Nov 11, 2021
carlocab
commented
Nov 11, 2021
|
Thanks for the PR @carlocab, just want to tweak the approach here a bit. |
MikeMcQuaid
approved these changes
Nov 11, 2021
| # used in vendor-install.sh | ||
| # shellcheck disable=SC2034 | ||
| HOMEBREW_PHYSICAL_PROCESSOR="arm64" | ||
| HOMEBREW_ROSETTA="$(sysctl -n sysctl.proc_translated)" |
There was a problem hiding this comment.
Could potentially be used in Library/Homebrew/extend/os/mac/hardware/cpu.rb but not sure if it's worth the effort 🤷🏻
There was a problem hiding this comment.
Yea, I thought about that, but decided doing
ENV["HOMEBREW_ROSETTA"].present? && ENV["HOMEBREW_ROSETTA"] == "1"was less nice.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since
HOMEBREW_PROCESSORis populated usinguname -m, this willregister as
Inteleven when a native ARM install is running underRosetta.
Let's work around this by checking
sysctl -n machdep.cpu.brand_string.On my Intel machine:
On Apple Silicon:
The case of a Rosetta installation of Homebrew is already handled below
the proposed change.
Fixes Homebrew/discussions#2434.