FileUtils.make: don't bypass superenv
This commit is contained in:
		
							parent
							
								
									8ec08479ae
								
							
						
					
					
						commit
						2aefd7eed6
					
				@ -111,10 +111,16 @@ module FileUtils
 | 
			
		||||
  # path to the actually-installed make on Tiger or older.
 | 
			
		||||
  def make(*args)
 | 
			
		||||
    if Utils.popen_read("/usr/bin/make", "--version").match(/Make (\d\.\d+)/)[1] > "3.80"
 | 
			
		||||
      system "/usr/bin/make", *args
 | 
			
		||||
      make_path = "/usr/bin/make"
 | 
			
		||||
    else
 | 
			
		||||
      make = Formula["make"].opt_bin/"make"
 | 
			
		||||
      make_path = make.exist? ? make.to_s : (Formula["make"].opt_bin/"gmake").to_s
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    if superenv?
 | 
			
		||||
      make_name = File.basename(make_path)
 | 
			
		||||
      system({ "MAKE" => make_name }, "make", *args)
 | 
			
		||||
    else
 | 
			
		||||
      system make_path, *args
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,5 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
export MAKE=${MAKE:-make}
 | 
			
		||||
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
 | 
			
		||||
exec xcrun make "$@"
 | 
			
		||||
exec xcrun $MAKE "$@"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user