No really, fix llvm_build_version and xcode_prefix

This commit is contained in:
Adam Vandenberg 2011-04-26 14:13:53 -07:00
parent 3ad0e634a3
commit 950440dd06

View File

@ -264,7 +264,7 @@ module MacOS extend self
elsif File.directory? '/Developer' elsif File.directory? '/Developer'
# we do this to support cowboys who insist on installing # we do this to support cowboys who insist on installing
# only a subset of Xcode # only a subset of Xcode
'/Developer' Pathname.new '/Developer'
else else
nil nil
end end
@ -273,7 +273,7 @@ module MacOS extend self
def llvm_build_version def llvm_build_version
unless xcode_prefix.to_s.empty? unless xcode_prefix.to_s.empty?
llvm_gcc_path = xcode_prefix.to_s + "usr/bin/llvm-gcc" llvm_gcc_path = xcode_prefix/"usr/bin/llvm-gcc"
# for Xcode 3 on OS X 10.5 this will not exist # for Xcode 3 on OS X 10.5 this will not exist
if llvm_gcc_path.file? if llvm_gcc_path.file?
`#{llvm_gcc_path} -v 2>&1` =~ /LLVM build (\d{4,})/ `#{llvm_gcc_path} -v 2>&1` =~ /LLVM build (\d{4,})/