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 Homebrew/homebrew#24123.
This commit is contained in:
parent
be08993a79
commit
426f5c0666
@ -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?
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user