diff options
| author | Misty De Meo | 2013-11-22 20:46:45 -0800 |
|---|---|---|
| committer | Misty De Meo | 2013-11-22 20:47:57 -0800 |
| commit | 2dc1798722090f4b9fcf89f4a3e7785bc5a5eb69 (patch) | |
| tree | 14b718d68b7df57d4fa2a8e1fc2dd8da96c363d8 /Library/Homebrew/os | |
| parent | bd51b486ba8176b0e6c01f62a1c9a4092c44bc56 (diff) | |
| download | homebrew-2dc1798722090f4b9fcf89f4a3e7785bc5a5eb69.tar.bz2 | |
Fix MacOS::CLT.installed? for 10.9+
This continues to use mavericks_dev_tools? instead of trying to read
from pkgutil because pkgutil is really slow.
Fixes #24123.
Diffstat (limited to 'Library/Homebrew/os')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 03467b98a..de710728c 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -169,11 +169,16 @@ module OS # True if: # - Xcode < 4.3 is installed. The tools are found under /usr. - # - The "Command Line Tools" package has been installed - # For OS X < 10.9, the tools are found under /usr. For 10.9, - # they are found under /Library/Developer/CommandLineTools. + # - The "Command Line Tools" package has been installed. + # For OS X < 10.9, the tools are found under /usr. 10.9 always + # includes tools there, which run the real tools inside Xcode on + # Xcode-only installs, so it's necessary to look elsewhere. def installed? - mavericks_dev_tools? || usr_dev_tools? + if MacOS.version < :mavericks + usr_dev_tools? + else + mavericks_dev_tools? + end end def mavericks_dev_tools? |