Merge pull request #3387 from MikeMcQuaid/env-std-homebrew-paths
ENV/std: fully extend from HOMEBREW_PATH.
This commit is contained in:
		
						commit
						2d5bb029a5
					
				@ -9,15 +9,12 @@ module Stdenv
 | 
			
		||||
  SAFE_CFLAGS_FLAGS = "-w -pipe".freeze
 | 
			
		||||
  DEFAULT_FLAGS = "-march=core2 -msse4".freeze
 | 
			
		||||
 | 
			
		||||
  def self.extended(base)
 | 
			
		||||
    return if ORIGINAL_PATHS.include? HOMEBREW_PREFIX/"bin"
 | 
			
		||||
    base.prepend_path "PATH", "#{HOMEBREW_PREFIX}/bin"
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  # @private
 | 
			
		||||
  def setup_build_environment(formula = nil)
 | 
			
		||||
    super
 | 
			
		||||
 | 
			
		||||
    PATH.new(ENV["HOMEBREW_PATH"]).each { |p| prepend_path "PATH", p }
 | 
			
		||||
 | 
			
		||||
    # Set the default pkg-config search path, overriding the built-in paths
 | 
			
		||||
    # Anything in PKG_CONFIG_PATH is searched before paths in this variable
 | 
			
		||||
    self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user