Merge pull request #7323 from Bo98/std-pc

Revert "ENV/std: withdraw support for Homebrew supplied *.pc files"
2020-04-11 13:12:58 +01:00 · 2020-04-11 13:12:58 +01:00 · 0eff14db55
commit 0eff14db55
parent 73df5891ef 8900e852d6
1 changed files with 5 additions and 1 deletions
--- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
@ -3,7 +3,11 @@
 module Stdenv
  # @private

-  undef x11
+  undef homebrew_extra_pkg_config_paths, x11
+
+  def homebrew_extra_pkg_config_paths
+    ["#{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"]
+  end

  def x11
    # There are some config scripts here that should go in the PATH