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

vendor-install: handle native ARM running under Rosetta

Browse Source 
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.
This commit is contained in:
Carlo Cabrera 2021-11-11 16:06:33 +08:00
parent 6c341516d3
commit 8aeb28781c
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cmd/vendor-install.sh
View File

@ -14,7 +14,8 @@ VENDOR_DIR="${HOMEBREW_LIBRARY}/Homebrew/vendor"
# Built from https://github.com/Homebrew/homebrew-portable-ruby. # Built from https://github.com/Homebrew/homebrew-portable-ruby.
if [[ -n "${HOMEBREW_MACOS}" ]] if [[ -n "${HOMEBREW_MACOS}" ]]
then then
if [[ "${HOMEBREW_PROCESSOR}" == "Intel" ]] || if [[ "${HOMEBREW_PROCESSOR}" == "Intel" &&
"$(sysctl -n machdep.cpu.brand_string)" != "Apple"* ]] ||
# Handle the case where /usr/local/bin/brew is run under arm64. # Handle the case where /usr/local/bin/brew is run under arm64.
# It's a x86_64 installation there (we refuse to install arm64 binaries) so # It's a x86_64 installation there (we refuse to install arm64 binaries) so
# use a x86_64 Portable Ruby. # use a x86_64 Portable Ruby.