diff options
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index 3485e2ce7..0b60e2472 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -31,7 +31,7 @@ module Stdenv end def homebrew_extra_pkg_config_paths - ["#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}"] + ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] end # Sets architecture-specific flags for every environment variable diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index 77625f455..acd2efa62 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -3,8 +3,7 @@ module Superenv def self.bin return unless DevelopmentTools.installed? - bin = HOMEBREW_ENV_PATH.subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max - bin.realpath unless bin.nil? + (HOMEBREW_SHIMS_PATH/"super").realpath end def effective_sysroot @@ -26,7 +25,8 @@ module Superenv # @private def homebrew_extra_pkg_config_paths - paths = ["#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}"] + paths = \ + ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11? paths end |