aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorCharlieRoot2011-07-21 20:44:08 +0400
committerAdam Vandenberg2011-08-04 10:07:08 -0700
commit7b85ca778b19960e8efc493b06b5fd4997b0357c (patch)
tree8d6f4e32821615e26b147182b216f236618019db /Library
parentd609d46595d89569a7860ddbb756ef84751b3397 (diff)
downloadhomebrew-7b85ca778b19960e8efc493b06b5fd4997b0357c.tar.bz2
Fix Xcode 4 compiler paths for --use-gcc
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 9696ebe90..230b21b0c 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -27,8 +27,10 @@ module HomebrewEnvExtension
self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/llvm-g++"
cflags = ['-O4'] # link time optimisation baby!
elsif MACOS_VERSION >= 10.6 and self.use_gcc?
- self['CC'] = "#{MacOS.xcode_prefix}/usr/bin/gcc"
- self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/g++"
+ # Xcode 4 makes gcc and g++ #{MacOS.xcode_prefix}/usr/bin/ links to llvm versions
+ # so we need to use gcc-4.2 and g++-4.2 for real non-llvm compilers
+ self['CC'] = "#{MacOS.xcode_prefix}/usr/bin/gcc-4.2"
+ self['CXX'] = "#{MacOS.xcode_prefix}/usr/bin/g++-4.2"
cflags = ['-O3']
else
# If these aren't set, many formulae fail to build