From 0f3f0626d312786b8d073d4a754109bf691c74b2 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Sat, 3 Sep 2011 11:21:31 +0100 Subject: [PATCH] Don't look for llvm-gcc in xcode_prefix Look in /usr/bin because all versions of Xcode install it to /usr/bin now and this allows us to support Xcode-less installs of Apple's developer tools. --- Library/Homebrew/utils.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 43c83c14d3..44595ac6ab 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -325,13 +325,11 @@ module MacOS extend self end def llvm_build_version - unless xcode_prefix.to_s.empty? - llvm_gcc_path = xcode_prefix/"usr/bin/llvm-gcc" - # for Xcode 3 on OS X 10.5 this will not exist - if llvm_gcc_path.file? - `#{llvm_gcc_path} -v 2>&1` =~ /LLVM build (\d{4,})/ - $1.to_i # if nil this raises and then you fix the regex - end + # for Xcode 3 on OS X 10.5 this will not exist + # NOTE may not be true anymore but we can't test + if File.exist? "/usr/bin/llvm-gcc" + `/usr/bin/llvm-gcc -v 2>&1` =~ /LLVM build (\d{4,})/ + $1.to_i end end