Remove unused :force switches
The :force behavior for ENV.gcc has been the default for some time, and was used to force vanilla gcc in case the gcc symlink pointed at llvm-gcc; for ENV.clang, this doesn't mattera as clang is just clang. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
		
							parent
							
								
									f8e3e806f9
								
							
						
					
					
						commit
						f295661ca6
					
				@ -126,7 +126,7 @@ module HomebrewEnvExtension
 | 
			
		||||
    ENV['CXX'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def gcc args = {}
 | 
			
		||||
  def gcc
 | 
			
		||||
    # Apple stopped shipping gcc-4.2 with Xcode 4.2
 | 
			
		||||
    # However they still provide a gcc symlink to llvm
 | 
			
		||||
    # But we don't want LLVM of course.
 | 
			
		||||
@ -157,7 +157,7 @@ module HomebrewEnvExtension
 | 
			
		||||
    @compiler = :llvm
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def clang args = {}
 | 
			
		||||
  def clang
 | 
			
		||||
    self['CC']  = xcrun "clang"
 | 
			
		||||
    self['CXX'] = xcrun "clang++"
 | 
			
		||||
    replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1')
 | 
			
		||||
 | 
			
		||||
@ -256,10 +256,10 @@ class Formula
 | 
			
		||||
      if llvm.build.to_i >= 2336
 | 
			
		||||
        if MacOS.xcode_version < "4.2"
 | 
			
		||||
          opoo "Formula will not build with LLVM, using GCC"
 | 
			
		||||
          ENV.gcc :force => true
 | 
			
		||||
          ENV.gcc
 | 
			
		||||
        else
 | 
			
		||||
          opoo "Formula will not build with LLVM, trying Clang"
 | 
			
		||||
          ENV.clang :force => true
 | 
			
		||||
          ENV.clang
 | 
			
		||||
        end
 | 
			
		||||
        return
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user