diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 60d6e05d04..00a9115559 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 b781681f86..b4763f8fb0 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:"