From eeef186fae0b5926e3071d93c7dbc01773bde6fb Mon Sep 17 00:00:00 2001 From: Mohammed Tangestani Date: Tue, 29 Jul 2014 16:22:06 -0400 Subject: git: fix PERLLIB_EXTRA for 10.10 Fixes #31310. Closes #31312. Signed-off-by: Jack Nagel --- Library/Formula/git.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb index ccb5f9675..cf9f7eb80 100644 --- a/Library/Formula/git.rb +++ b/Library/Formula/git.rb @@ -46,15 +46,17 @@ class Git < Formula ENV['PYTHON_PATH'] = which 'python' ENV['PERL_PATH'] = which 'perl' + perl_version = /\d\.\d+/.match(`perl --version`) + if build.with? 'brewed-svn' - ENV["PERLLIB_EXTRA"] = "#{Formula["subversion"].prefix}/Library/Perl/5.16/darwin-thread-multi-2level" + ENV["PERLLIB_EXTRA"] = "#{Formula["subversion"].prefix}/Library/Perl/#{perl_version}/darwin-thread-multi-2level" elsif MacOS.version >= :mavericks ENV["PERLLIB_EXTRA"] = %W{ #{MacOS.active_developer_dir} /Library/Developer/CommandLineTools /Applications/Xcode.app/Contents/Developer }.uniq.map { |p| - "#{p}/Library/Perl/5.16/darwin-thread-multi-2level" + "#{p}/Library/Perl/#{perl_version}/darwin-thread-multi-2level" }.join(":") end -- cgit v1.2.3