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

Use effective_arch for rustflags

Browse Source
This commit is contained in:
Henry 2024-06-30 02:23:29 -04:00
parent 09223c700a
commit 22d42efb5c
No known key found for this signature in database
GPG Key ID: 03108A8D9159E2AE
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/ENV/std.rb
View File

@ -34,7 +34,7 @@ module Stdenv
self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir
self["MAKEFLAGS"] = "-j#{make_jobs}" self["MAKEFLAGS"] = "-j#{make_jobs}"
self["RUSTFLAGS"] = Hardware.rustflags_target_cpu self["RUSTFLAGS"] = Hardware.rustflags_target_cpu(effective_arch)
if HOMEBREW_PREFIX.to_s != "/usr/local" if HOMEBREW_PREFIX.to_s != "/usr/local"
# /usr/local is already an -isystem and -L directory so we skip it # /usr/local is already an -isystem and -L directory so we skip it

2
Library/Homebrew/extend/ENV/super.rb
View File

@ -62,7 +62,7 @@ module Superenv
self["HOMEBREW_ENV"] = "super" self["HOMEBREW_ENV"] = "super"
self["MAKEFLAGS"] ||= "-j#{determine_make_jobs}" self["MAKEFLAGS"] ||= "-j#{determine_make_jobs}"
self["RUSTFLAGS"] = Hardware.rustflags_target_cpu self["RUSTFLAGS"] = Hardware.rustflags_target_cpu(effective_arch)
self["PATH"] = determine_path self["PATH"] = determine_path
self["PKG_CONFIG_PATH"] = determine_pkg_config_path self["PKG_CONFIG_PATH"] = determine_pkg_config_path
self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir

8
Library/Homebrew/hardware.rb
View File

@ -226,16 +226,16 @@ module Hardware
# Returns a Rust flag to set the target CPU if necessary. # Returns a Rust flag to set the target CPU if necessary.
# Defaults to nil. # Defaults to nil.
sig { returns(T.nilable(String)) } sig { params(arch: Symbol).returns(T.nilable(String)) }
def rustflags_target_cpu def rustflags_target_cpu(arch)
# Rust already defaults to the oldest supported cpu for each target-triplet # Rust already defaults to the oldest supported cpu for each target-triplet
# so it's safe to ignore generic archs such as :armv6 here. # so it's safe to ignore generic archs such as :armv6 here.
# Rust defaults to apple-m1 since Rust 1.71 for aarch64-apple-darwin. # Rust defaults to apple-m1 since Rust 1.71 for aarch64-apple-darwin.
@target_cpu ||= case (cpu = oldest_cpu) @target_cpu ||= case (arch)
when :core when :core
:prescott :prescott
when :native, :ivybridge, :sandybridge, :westmere, :nehalem, :core2 when :native, :ivybridge, :sandybridge, :westmere, :nehalem, :core2
cpu arch
end end
return if @target_cpu.blank? return if @target_cpu.blank?