diff options
| author | Xu Cheng | 2016-03-20 01:44:36 +0800 |
|---|---|---|
| committer | Xu Cheng | 2016-03-21 19:07:38 +0800 |
| commit | ce7b32cec835bb658df75a0c691db9a97921163c (patch) | |
| tree | 4be42d9ee326a5ca278a56d0f6c614452b0ef5e7 /Library/Homebrew/extend | |
| parent | 28b4923dad7a421f6f6d2598a5661a147268a4c7 (diff) | |
| download | brew-ce7b32cec835bb658df75a0c691db9a97921163c.tar.bz2 | |
add HOMEBREW_ENV_PATH internal variable
`Library/ENV` like `Library/Homebrew` is part of Homebrew basecode. It
should be able to be accessed during the `brew tests`.
By adding HOMEBREW_ENV_PATH variable, we allow test suit to locate these
codes.
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 8bfc5ce57..b3b91dc47 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -77,7 +77,7 @@ module Stdenv paths = [] paths << "#{HOMEBREW_PREFIX}/lib/pkgconfig" paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" - paths << "#{HOMEBREW_LIBRARY}/ENV/pkgconfig/#{MacOS.version}" + paths << "#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}" paths << "/usr/lib/pkgconfig" paths.select { |d| File.directory? d }.join(File::PATH_SEPARATOR) end diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index c2401602f..e4eb86cdf 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -28,7 +28,7 @@ module Superenv def self.bin return unless MacOS.has_apple_developer_tools? - bin = (HOMEBREW_REPOSITORY/"Library/ENV").subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max + bin = HOMEBREW_ENV_PATH.subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max bin.realpath unless bin.nil? end @@ -150,7 +150,7 @@ module Superenv end def determine_pkg_config_libdir - paths = %W[/usr/lib/pkgconfig #{HOMEBREW_LIBRARY}/ENV/pkgconfig/#{MacOS.version}] + paths = %W[/usr/lib/pkgconfig #{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}] paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11? paths.to_path_s end |
