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

Merge pull request #7538 from MikeMcQuaid/bottle_arch

Browse Source 
Replace ARGV#bottle_arch with Homebrew.args.bottle_arch
This commit is contained in:
Mike McQuaid 2020-05-11 08:46:57 +01:00 committed by GitHub
commit 1c656fb584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/extend/ARGV.rb
View File

@ -15,11 +15,6 @@ module HomebrewArgvExtension
flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil? flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
end end
def bottle_arch
arch = value "bottle-arch"
arch&.to_sym
end
def cc def cc
value "cc" value "cc"
end end

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

@ -254,8 +254,8 @@ module SharedEnvExtension
# @private # @private
def effective_arch def effective_arch
if Homebrew.args.build_bottle? && ARGV.bottle_arch if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
ARGV.bottle_arch Homebrew.args.bottle_arch
else else
Hardware.oldest_cpu Hardware.oldest_cpu
end end

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

@ -4,7 +4,7 @@ module SharedEnvExtension
# @private # @private
def effective_arch def effective_arch
if Homebrew.args.build_bottle? if Homebrew.args.build_bottle?
ARGV.bottle_arch || Hardware.oldest_cpu Homebrew.args.bottle_arch || Hardware.oldest_cpu
else else
:native :native
end end

4
Library/Homebrew/formula_installer.rb
View File

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