diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/superenv/macsystem.rb | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 3fdd90463..3fa7d62ae 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -158,8 +158,12 @@ module MacOS::CLT extend self # This is true ift he standard UNIX tools are present under /usr. For # Xcode < 4.3, this is the standard location. Otherwise, it means that # the user has installed the "Command Line Tools for Xcode" package. + # TODO: handle 10.9 CLT which has headers under: + # /Library/Developer/CommandLineTools/usr/include def installed? - MacOS.dev_tools_path == Pathname.new("/usr/bin") + return false if MacOS.version > :mountain_lion + MacOS.dev_tools_path == Pathname.new("/usr/bin") and + File.directory? "/usr/include" end def latest_version? diff --git a/Library/Homebrew/superenv/macsystem.rb b/Library/Homebrew/superenv/macsystem.rb index 7d2a7880f..7ac282b08 100644 --- a/Library/Homebrew/superenv/macsystem.rb +++ b/Library/Homebrew/superenv/macsystem.rb @@ -1,7 +1,10 @@ # new code because I don't really trust the Xcode code now having researched it more module MacSystem extend self def xcode_clt_installed? - File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb" and File.executable? "/usr/bin/make" + # TODO: handle 10.9 CLT which has headers under: + # /Library/Developer/CommandLineTools/usr/include + File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb" and + File.executable? "/usr/bin/make" and File.directory? "/usr/include" end def xcode43_without_clt? |