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

Fix Xcode builds on 10.9.

Browse Source 
CLT-only builds are still broken and need to be fixed at some point.

Closes Homebrew/homebrew#20524.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Clemens Gruber 2013-06-15 18:38:32 +02:00 committed by Mike McQuaid
parent 32f637d590
commit c5f9f42e51
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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?

5
Library/Homebrew/superenv/macsystem.rb
View File

@ -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?