Replace ARGV#bottle_arch with Homebrew.args.bottle_arch
Part of https://github.com/Homebrew/brew/issues/5730
This commit is contained in:
		
							parent
							
								
									7bd454746e
								
							
						
					
					
						commit
						07b19cba09
					
				@ -15,11 +15,6 @@ module HomebrewArgvExtension
 | 
			
		||||
    flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def bottle_arch
 | 
			
		||||
    arch = value "bottle-arch"
 | 
			
		||||
    arch&.to_sym
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def cc
 | 
			
		||||
    value "cc"
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
@ -268,8 +268,8 @@ module SharedEnvExtension
 | 
			
		||||
 | 
			
		||||
  # @private
 | 
			
		||||
  def effective_arch
 | 
			
		||||
    if Homebrew.args.build_bottle? && ARGV.bottle_arch
 | 
			
		||||
      ARGV.bottle_arch
 | 
			
		||||
    if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
 | 
			
		||||
      Homebrew.args.bottle_arch
 | 
			
		||||
    else
 | 
			
		||||
      Hardware.oldest_cpu
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@ -4,7 +4,7 @@ module SharedEnvExtension
 | 
			
		||||
  # @private
 | 
			
		||||
  def effective_arch
 | 
			
		||||
    if Homebrew.args.build_bottle?
 | 
			
		||||
      ARGV.bottle_arch || Hardware.oldest_cpu
 | 
			
		||||
      Homebrew.args.bottle_arch || Hardware.oldest_cpu
 | 
			
		||||
    else
 | 
			
		||||
      :native
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@ -267,7 +267,7 @@ class FormulaInstaller
 | 
			
		||||
 | 
			
		||||
    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}"
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@ -699,7 +699,7 @@ class FormulaInstaller
 | 
			
		||||
 | 
			
		||||
    if 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
 | 
			
		||||
 | 
			
		||||
    args << "--git" if git?
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user