Some more sanity with ENV.compiler

Deprecated use_clang? etc. since the logic was such that multiple states could be set, when in reality only one compiler can be set.

Changed fails_with_llvm handling so if HOMEBREW_USE_LLVM is set then it tries to build even if the formula has fails_with_llvm set. Rationale: mostly they will no longer fail and we need to catch these cases.

1 files changed, 5 insertions, 3 deletions

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index aead9a790..2ee2fb89a 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -38,9 +38,11 @@ class Ffmpeg < Formula
     if MacOS.lion?
       args << "--cc=clang"
     else
-      args << "--cc=clang" if ENV.use_clang?
-      args << "--cc=llvm-gcc" if ENV.use_llvm?
-      args << "--cc=gcc" if ENV.use_gcc?
+      args << case ENV.compiler
+        when :clang then "--cc=clang"
+        when :llvm then "--cc=llvm-gcc"
+        when :gcc then "--cc=gcc"
+      end
     end
 
     # For 32-bit compilation under gcc 4.2, see: