diff options
| author | Mohammed Tangestani | 2014-07-29 16:22:06 -0400 |
|---|---|---|
| committer | Jack Nagel | 2014-08-12 18:48:24 -0500 |
| commit | eeef186fae0b5926e3071d93c7dbc01773bde6fb (patch) | |
| tree | 721f0973b0198e5b2bc2025ece954719247834c3 | |
| parent | df646856159f466bb8a7fb8b9c85a43fb895115b (diff) | |
| download | homebrew-eeef186fae0b5926e3071d93c7dbc01773bde6fb.tar.bz2 | |
git: fix PERLLIB_EXTRA for 10.10
Fixes #31310.
Closes #31312.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/git.rb | 6 |
1 files changed, 4 insertions, 2 deletions
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 |