diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index d3b09b60a1..6fc6625f4c 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -301,7 +301,7 @@ class Formula
   end
 
   def handle_llvm_failure llvm
-    unless (ENV['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm')
+    unless (ENV['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm' or ARGV.include? '--use-clang')
       ENV.gcc_4_2 if default_cc =~ /llvm/
       return
     end