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

Merge pull request #2998 from andrewyatz/bugfix/pkgconfiglibdir

Browse Source 
Bugfix/pkgconfiglibdir
This commit is contained in:
Mike McQuaid 2017-08-07 11:44:58 +01:00 committed by GitHub
commit 5327b304a6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/extend/ENV/super.rb
View File

@ -138,7 +138,6 @@ module Superenv
def determine_pkg_config_libdir def determine_pkg_config_libdir
PATH.new( PATH.new(
"/usr/lib/pkgconfig",
homebrew_extra_pkg_config_paths, homebrew_extra_pkg_config_paths,
).existing ).existing
end end

2
Library/Homebrew/extend/os/mac/extend/ENV/super.rb
View File

@ -28,7 +28,7 @@ module Superenv
# @private # @private
def homebrew_extra_pkg_config_paths def homebrew_extra_pkg_config_paths
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 << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11?
paths paths
end end