admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix MacOS::CLT.installed? for 10.9+

Browse Source 
This continues to use mavericks_dev_tools? instead of trying to read
from pkgutil because pkgutil is really slow.

Fixes Homebrew/homebrew#24123.
This commit is contained in:
Misty De Meo 2013-11-22 20:46:45 -08:00
parent be08993a79
commit 426f5c0666
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/os/mac/xcode.rb
View File

@ -169,11 +169,16 @@ module OS
# True if: # True if:
# - Xcode < 4.3 is installed. The tools are found under /usr. # - Xcode < 4.3 is installed. The tools are found under /usr.
# - The "Command Line Tools" package has been installed # - The "Command Line Tools" package has been installed.
# For OS X < 10.9, the tools are found under /usr. For 10.9, # For OS X < 10.9, the tools are found under /usr. 10.9 always
# they are found under /Library/Developer/CommandLineTools. # includes tools there, which run the real tools inside Xcode on
# Xcode-only installs, so it's necessary to look elsewhere.
def installed? def installed?
mavericks_dev_tools? || usr_dev_tools? if MacOS.version < :mavericks
usr_dev_tools?
else
mavericks_dev_tools?
end
end end
def mavericks_dev_tools? def mavericks_dev_tools?