aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2011-03-17 17:21:42 +0000
committerMike McQuaid2011-03-17 17:21:42 +0000
commit52b86699c8b0678afe8804ad661cf80e23fe20fb (patch)
tree2c44abe6cad705af359784af11b7fad3dbfcf2fc /Library
parent302b384d214e68373adddc19f5b34907e8fed786 (diff)
downloadhomebrew-52b86699c8b0678afe8804ad661cf80e23fe20fb.tar.bz2
Use xcode_path for GCC as well as LLVM.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index f5a61faa5..f0e2364ab 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