aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlieRoot2011-07-21 20:44:08 +0400
committerAdam Vandenberg2011-08-04 10:07:08 -0700
commitc76ae1a94fce263a287fa02c49cd062770d96a35 (patch)
treef6295ecc8f81d723bb8144eb686c8526f080c703
parentfb56b56997bf87d66df65716c175360cda86cee9 (diff)
downloadbrew-c76ae1a94fce263a287fa02c49cd062770d96a35.tar.bz2
Fix Xcode 4 compiler paths for --use-gcc
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
-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