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

Merge pull request #3387 from MikeMcQuaid/env-std-homebrew-paths

Browse Source 
ENV/std: fully extend from HOMEBREW_PATH.
This commit is contained in:
Mike McQuaid 2017-10-30 16:09:01 +00:00 committed by GitHub
commit 2d5bb029a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/extend/ENV/std.rb
View File

@ -9,15 +9,12 @@ module Stdenv
SAFE_CFLAGS_FLAGS = "-w -pipe".freeze SAFE_CFLAGS_FLAGS = "-w -pipe".freeze
DEFAULT_FLAGS = "-march=core2 -msse4".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 # @private
def setup_build_environment(formula = nil) def setup_build_environment(formula = nil)
super super
PATH.new(ENV["HOMEBREW_PATH"]).each { |p| prepend_path "PATH", p }
# Set the default pkg-config search path, overriding the built-in paths # Set the default pkg-config search path, overriding the built-in paths
# Anything in PKG_CONFIG_PATH is searched before paths in this variable # Anything in PKG_CONFIG_PATH is searched before paths in this variable
self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir