diff options
| author | Mike McQuaid | 2017-08-07 11:44:58 +0100 |
|---|---|---|
| committer | GitHub | 2017-08-07 11:44:58 +0100 |
| commit | 5327b304a63afab5dab8e68af2569363077e2c6c (patch) | |
| tree | e56440240c35436e4d1b6633d74807f6ef8f6c00 /Library | |
| parent | 8e89b9d9d06e52d183b9382fdb316139f1922f27 (diff) | |
| parent | 9b5a3b80bf536471f34f62c7ba5d4dc9ae3aec06 (diff) | |
| download | brew-5327b304a63afab5dab8e68af2569363077e2c6c.tar.bz2 | |
Merge pull request #2998 from andrewyatz/bugfix/pkgconfiglibdir
Bugfix/pkgconfiglibdir
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 692fd3623..b518c22a1 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -138,7 +138,6 @@ module Superenv def determine_pkg_config_libdir PATH.new( - "/usr/lib/pkgconfig", homebrew_extra_pkg_config_paths, ).existing end diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index f97a2dbbb..9c20cc7c6 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -28,7 +28,7 @@ module Superenv # @private def homebrew_extra_pkg_config_paths paths = \ - ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] + ["/usr/lib/pkgconfig", "#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"] paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11? paths end |