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

Merge pull request #7602 from MikeMcQuaid/bottle_arch_sym

Browse Source 
bottle_arch: ensure a symbol is used when needed.
This commit is contained in:
Mike McQuaid 2020-05-19 09:27:16 +01:00 committed by GitHub
commit e254e804ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ module SharedEnvExtension
# @private # @private
def effective_arch def effective_arch
if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
Homebrew.args.bottle_arch Homebrew.args.bottle_arch.to_sym
else else
Hardware.oldest_cpu Hardware.oldest_cpu
end end

6
Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
View File

@ -3,8 +3,10 @@
module SharedEnvExtension module SharedEnvExtension
# @private # @private
def effective_arch def effective_arch
if Homebrew.args.build_bottle? if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
Homebrew.args.bottle_arch || Hardware.oldest_cpu Homebrew.args.bottle_arch.to_sym
elsif Homebrew.args.build_bottle?
Hardware.oldest_cpu
else else
:native :native
end end

2
Library/Homebrew/formula_installer.rb
View File

@ -269,7 +269,7 @@ class FormulaInstaller
return if only_deps? return if only_deps?
if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch) if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch.to_sym)
raise "Unrecognized architecture for --bottle-arch: #{arch}" raise "Unrecognized architecture for --bottle-arch: #{arch}"
end end