diff options
| author | Jack Nagel | 2014-05-01 18:36:46 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-01 18:36:46 -0500 |
| commit | 1032da4992bea39b70baf9eac1cb1bc9985930fc (patch) | |
| tree | b1a546ba75d4e2ec924b721dcc95821ef0b408b6 /Library | |
| parent | 78ed677ba2dab74dec7983c56b6f77f96c8da182 (diff) | |
| download | homebrew-1032da4992bea39b70baf9eac1cb1bc9985930fc.tar.bz2 | |
Remove MacOS.dev_tools_path and MacOS.dev_tools_prefix
These methods are no longer required.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/git.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac.rb | 20 |
2 files changed, 2 insertions, 22 deletions
diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb index 2585b97ff..7a60c4237 100644 --- a/Library/Formula/git.rb +++ b/Library/Formula/git.rb @@ -43,8 +43,8 @@ class Git < Formula ENV['PYTHON_PATH'] = which 'python' ENV['PERL_PATH'] = which 'perl' - if MacOS.version >= :mavericks and MacOS.dev_tools_prefix - ENV['PERLLIB_EXTRA'] = "#{MacOS.dev_tools_prefix}/Library/Perl/5.16/darwin-thread-multi-2level" + if MacOS.version >= :mavericks + ENV['PERLLIB_EXTRA'] = "#{MacOS.active_developer_dir}/Library/Perl/5.16/darwin-thread-multi-2level" end unless quiet_system ENV['PERL_PATH'], '-e', 'use ExtUtils::MakeMaker' diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index c2dd1a1f6..b6446ae5c 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -40,26 +40,6 @@ module OS @active_developer_dir ||= `xcode-select -print-path 2>/dev/null`.strip end - def dev_tools_prefix - dev_tools_path.parent.parent - end - - def dev_tools_path - @dev_tools_path ||= if tools_in_prefix? CLT::MAVERICKS_PKG_PATH - Pathname.new "#{CLT::MAVERICKS_PKG_PATH}/usr/bin" - elsif tools_in_prefix? "/" - Pathname.new "/usr/bin" - elsif not (make_path = `/usr/bin/xcrun -find make 2>/dev/null`).empty? - Pathname.new(make_path.chomp).dirname - elsif Xcode.prefix && File.exist?("#{Xcode.prefix}/usr/bin/make") - Pathname.new "#{Xcode.prefix}/usr/bin" - end - end - - def tools_in_prefix?(prefix) - %w{cc make}.all? { |tool| File.executable? "#{prefix}/usr/bin/#{tool}" } - end - def sdk_path(v = version) (@sdk_path ||= {}).fetch(v.to_s) do |key| opts = [] |
