From fcc9cfa6ae01b8c04f217692c69ed5e1e629baad Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Wed, 5 Oct 2016 01:45:24 +0100 Subject: [PATCH] apr_requirement: favour system as much as possible --- Library/Homebrew/requirements/apr_requirement.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/requirements/apr_requirement.rb b/Library/Homebrew/requirements/apr_requirement.rb index 3d56c52a1f..440788def8 100644 --- a/Library/Homebrew/requirements/apr_requirement.rb +++ b/Library/Homebrew/requirements/apr_requirement.rb @@ -12,10 +12,13 @@ class AprRequirement < Requirement end env do - ENV.prepend_path "PATH", Formula["apr-util"].opt_bin - ENV.prepend_path "PATH", Formula["apr"].opt_bin - ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig" - ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig" + # Prefer system Apr as much as possible, even if our's is installed. + unless MacOS.version > :leopard && MacOS.version < :sierra && MacOS::CLT.installed? + ENV.prepend_path "PATH", Formula["apr-util"].opt_bin + ENV.prepend_path "PATH", Formula["apr"].opt_bin + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig" + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig" + end end def to_dependency