diff options
| author | Mike McQuaid | 2017-10-30 16:09:01 +0000 |
|---|---|---|
| committer | GitHub | 2017-10-30 16:09:01 +0000 |
| commit | 2d5bb029a51f17d15ee6a61160297a748c28f6be (patch) | |
| tree | 8516bc6583a773d4bb1d62e7b7ccf15790b860a8 /Library | |
| parent | 6c9ff7f6429aaa5504ea862dc661ecdd5812561a (diff) | |
| parent | f72aba548d95d6b1eb320adbde70576e3476f010 (diff) | |
| download | brew-2d5bb029a51f17d15ee6a61160297a748c28f6be.tar.bz2 | |
Merge pull request #3387 from MikeMcQuaid/env-std-homebrew-paths
ENV/std: fully extend from HOMEBREW_PATH.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 4e5d0683a..3d082dc83 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -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 |