From ec0ae5ee99e4b9e2de2917cced0741c51e2719ac Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 17 Mar 2011 17:21:42 +0000 Subject: [PATCH] Use xcode_path for GCC as well as LLVM. --- Library/Homebrew/extend/ENV.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index f5a61faa55..f0e2364ab2 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -18,15 +18,15 @@ module HomebrewEnvExtension self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}" end + xcode_path = `/usr/bin/xcode-select -print-path`.chomp + xcode_path = "/Developer" if xcode_path.to_s.empty? if MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm') - xcode_path = `/usr/bin/xcode-select -print-path`.chomp - xcode_path = "/Developer" if xcode_path.to_s.empty? self['CC'] = "#{xcode_path}/usr/bin/llvm-gcc" self['CXX'] = "#{xcode_path}/usr/bin/llvm-g++" cflags = ['-O4'] # link time optimisation baby! elsif MACOS_VERSION >= 10.6 and (self['HOMEBREW_USE_GCC'] or ARGV.include? '--use-gcc') - self['CC'] = '/usr/bin/gcc' - self['CXX'] = '/usr/bin/g++' + self['CC'] = "#{xcode_path}/usr/bin/gcc" + self['CXX'] = "#{xcode_path}/usr/bin/g++" cflags = ['-O3'] else # If these aren't set, many formulae fail to build