diff options
| author | Mike McQuaid | 2012-01-16 20:05:51 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2012-01-16 21:00:24 +0000 |
| commit | 28c20b387b5bc6a7283906fa961056362cc3f98e (patch) | |
| tree | f91533d0347acf42a5bf77ba7a287896b3a660cc | |
| parent | 1e98594277868ef9b81146641aa60efe6196ed97 (diff) | |
| download | homebrew-28c20b387b5bc6a7283906fa961056362cc3f98e.tar.bz2 | |
Don't try and use GCC on Xcode 4.2: it's gone Jim.
Closes #9622.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 60d6e05d0..00a911555 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -103,7 +103,7 @@ module HomebrewEnvExtension @compiler = :llvm end - def clang + def clang args = {} self['CC'] = "/usr/bin/clang" self['CXX'] = "/usr/bin/clang++" replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1') diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index b781681f8..b4763f8fb 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -339,8 +339,13 @@ class Formula # latest version we have tested against so we will switch to GCC and # bump this integer when Xcode 4.3 is released. TODO do that! if llvm.build.to_i >= 2336 - opoo "Formula will not build with LLVM, using GCC" - ENV.gcc :force => true + if MacOS.xcode_version < "4.2" + opoo "Formula will not build with LLVM, using GCC" + ENV.gcc :force => true + else + opoo "Formula will not build with LLVM, trying Clang" + ENV.clang :force => true + end return end opoo "Building with LLVM, but this formula is reported to not work with LLVM:" |