Update fails_with_llvm in formulae

72 files changed, 168 insertions, 145 deletions

diff --git a/Library/Formula/aria2.rb b/Library/Formula/aria2.rb
index 6f2e8fa70..1feb57cb3 100644
--- a/Library/Formula/aria2.rb
+++ b/Library/Formula/aria2.rb
@@ -5,8 +5,9 @@ class Aria2 < Formula
   md5 '856cd88e75c7b893b42f4b6b8f2c0ad1'
   homepage 'http://aria2.sourceforge.net/'
 
+  fails_with_llvm "1.8.2 didn't work w/ LLVM"
+
   def install
-    fails_with_llvm "1.8.2 didn't work w/ LLVM"
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/aspell.rb b/Library/Formula/aspell.rb
index 3d7f2fe54..ec19cb493 100644
--- a/Library/Formula/aspell.rb
+++ b/Library/Formula/aspell.rb
@@ -13,6 +13,8 @@ class Aspell < Formula
   homepage 'http://aspell.net/'
   md5 'bc80f0198773d5c05086522be67334eb'
 
+  fails_with_llvm "Segmentation fault during linking."
+
   def options
     [
       ['--lang=XX,...', "Install dictionary for language XX where XX is the country code, e.g.: --lang=en,es\n\tAvailable country codes: #{available_languages.join(', ')}"],
@@ -21,7 +23,6 @@ class Aspell < Formula
   end
 
   def install
-    fails_with_llvm
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
diff --git a/Library/Formula/bdw-gc.rb b/Library/Formula/bdw-gc.rb
index a2edf660b..8a270e719 100644
--- a/Library/Formula/bdw-gc.rb
+++ b/Library/Formula/bdw-gc.rb
@@ -5,10 +5,10 @@ class BdwGc < Formula
   homepage 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/'
   md5 '2ff9924c7249ef7f736ecfe6f08f3f9b'
 
-  def install
-    fails_with_llvm "LLVM gives an unsupported inline asm error"
+  fails_with_llvm "LLVM gives an unsupported inline asm error"
 
-    if MACOS_VERSION == 10.6
+  def install
+    if 10.6 <= MACOS_VERSION
       # ucontext has been deprecated in 10.6
       # use this flag to force the header to compile
       ENV.append 'CPPFLAGS', "-D_XOPEN_SOURCE"
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index ae5c92dd1..a80cc1762 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -12,10 +12,9 @@ class Boost < Formula
     ]
   end
 
-  def install
-    fails_with_llvm "LLVM-GCC causes errors with dropped arguments to "+
-                    "functions when linking with boost"
+  fails_with_llvm "LLVM-GCC causes errors with dropped arguments to functions when linking with boost"
 
+  def install
     # Adjust the name the libs are installed under to include the path to the
     # Homebrew lib directory so executables will work when installed to a
     # non-/usr/local location.
diff --git a/Library/Formula/cdargs.rb b/Library/Formula/cdargs.rb
index ac6e5845e..3a90cfcae 100644
--- a/Library/Formula/cdargs.rb
+++ b/Library/Formula/cdargs.rb
@@ -5,9 +5,9 @@ class Cdargs < Formula
   homepage 'http://www.skamphausen.de/cgi-bin/ska/CDargs'
   md5 '50be618d67f0b9f2439526193c69c567'
 
-  def install
-    fails_with_llvm "Bus error in ld on SL 10.6.4"
+  fails_with_llvm "Bus error in ld on SL 10.6.4"
 
+  def install
     system "./configure", "--prefix=#{prefix}", "--mandir=#{man}"
     system "make"
     system "make install-strip"
diff --git a/Library/Formula/cdparanoia.rb b/Library/Formula/cdparanoia.rb
index 026a9079b..db0ae978d 100644
--- a/Library/Formula/cdparanoia.rb
+++ b/Library/Formula/cdparanoia.rb
@@ -12,8 +12,9 @@ class Cdparanoia < Formula
     ]
   end
 
+  fails_with_llvm '"File too small" error while linking', :build => 2326
+
   def install
-    fails_with_llvm "\"File too small\" error while linking", :build => 2326
     system "autoconf"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
            "--prefix=#{prefix}", "--mandir=#{man}"
diff --git a/Library/Formula/cdrdao.rb b/Library/Formula/cdrdao.rb
index d99153237..219e686f8 100644
--- a/Library/Formula/cdrdao.rb
+++ b/Library/Formula/cdrdao.rb
@@ -17,8 +17,9 @@ class Cdrdao < Formula
     "http://sourceforge.net/tracker/download.php?group_id=2171&atid=302171&file_id=369387&aid=2981804"
   end
 
+  fails_with_llvm "Segfault while linking", :build => 2326
+
   def install
-    fails_with_llvm "Segfault while linking", :build => 2326
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
diff --git a/Library/Formula/celt.rb b/Library/Formula/celt.rb
index a663f599a..7153b3f72 100644
--- a/Library/Formula/celt.rb
+++ b/Library/Formula/celt.rb
@@ -7,8 +7,9 @@ class Celt < Formula
 
   depends_on 'libogg' => :optional
 
+  fails_with_llvm "1 test failed with llvm-gcc"
+
   def install
-    fails_with_llvm "1 test failed with llvm-gcc"
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--enable-new-plc"
diff --git a/Library/Formula/clisp.rb b/Library/Formula/clisp.rb
index 41fab02c8..99aebf2a7 100644
--- a/Library/Formula/clisp.rb
+++ b/Library/Formula/clisp.rb
@@ -11,11 +11,10 @@ class Clisp < Formula
 
   skip_clean :all # otherwise abort trap
 
-  def install
-    # This build isn't parallel safe.
-    ENV.j1
+  fails_with_llvm "Fails during configure with LLVM GCC from XCode 4 on Snow Leopard"
 
-    fails_with_llvm "Fails during configure with LLVM GCC from XCode 4 on Snow Leopard"
+  def install
+    ENV.j1 # This build isn't parallel safe.
 
     # Clisp requires to select word size explicitly this way,
     # set it in CFLAGS won't work.
diff --git a/Library/Formula/dirac.rb b/Library/Formula/dirac.rb
index 8aaec76a3..25ab7df6b 100644
--- a/Library/Formula/dirac.rb
+++ b/Library/Formula/dirac.rb
@@ -5,8 +5,9 @@ class Dirac < Formula
   md5 'a57c2c5e58062d437d9ab13dffb28f0f'
   homepage 'http://diracvideo.org/'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/elinks.rb b/Library/Formula/elinks.rb
index 04c76e940..f36baee56 100644
--- a/Library/Formula/elinks.rb
+++ b/Library/Formula/elinks.rb
@@ -5,8 +5,9 @@ class Elinks < Formula
   url 'http://elinks.or.cz/download/elinks-0.11.7.tar.bz2'
   md5 'fcd087a6d2415cd4c6fd1db53dceb646'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     ENV.deparallelize
     ENV.delete('LD')
     system "./configure", "--prefix=#{prefix}", "--without-spidermonkey"
diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index 0d12198db..2a84384a1 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -56,9 +56,9 @@ class Emacs < Formula
     return s
   end
 
-  def install
-    fails_with_llvm "Duplicate symbol errors while linking."
+  fails_with_llvm "Duplicate symbol errors while linking."
 
+  def install
     args = ["--prefix=#{prefix}",
             "--without-dbus",
             "--enable-locallisppath=#{HOMEBREW_PREFIX}/share/emacs/site-lisp",
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index 6e9201bc2..acfa239fa 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -32,9 +32,10 @@ class Erlang < Formula
     ]
   end
 
+  fails_with_llvm "See https://github.com/mxcl/homebrew/issues/issue/120", :build => 2326
+
   def install
     ENV.deparallelize
-    fails_with_llvm "See https://github.com/mxcl/homebrew/issues/issue/120", :build => 2326
 
     # If building from GitHub, this step is required (but not for tarball downloads.)
     system "./otp_build autoconf" if File.exist? "otp_build"
diff --git a/Library/Formula/flac.rb b/Library/Formula/flac.rb
index 9e2958d9c..9bc99761d 100644
--- a/Library/Formula/flac.rb
+++ b/Library/Formula/flac.rb
@@ -13,9 +13,9 @@ class Flac < Formula
   depends_on 'lame'
   depends_on 'libogg' => :optional
 
-  def install
-    fails_with_llvm "Undefined symbols when linking", :build => 2326
+  fails_with_llvm "Undefined symbols when linking", :build => 2326
 
+  def install
     # sadly the asm optimisations won't compile since Leopard, and nobody
     # cares or knows how to fix it
     system "./configure", "--disable-debug",
diff --git a/Library/Formula/flusspferd.rb b/Library/Formula/flusspferd.rb
index f9eba72d7..f5c9fc7bb 100644
--- a/Library/Formula/flusspferd.rb
+++ b/Library/Formula/flusspferd.rb
@@ -11,8 +11,9 @@ class Flusspferd < Formula
   depends_on 'boost'
   depends_on 'spidermonkey'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "cmake -H. -Bbuild #{std_cmake_parameters}"
     system "make install"
   end
diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb
index b907283c4..d4169dd00 100644
--- a/Library/Formula/fontforge.rb
+++ b/Library/Formula/fontforge.rb
@@ -11,9 +11,9 @@ class Fontforge < Formula
   depends_on 'pango'
   depends_on 'potrace'
 
-  def install
-    fails_with_llvm "Compiling cvexportdlg.c fails with error: initializer element is not constant"
+  fails_with_llvm "Compiling cvexportdlg.c fails with error: initializer element is not constant"
 
+  def install
     ENV.x11
     # Fix linker error; see: http://trac.macports.org/ticket/25012
     ENV.append "LDFLAGS", "-lintl"
diff --git a/Library/Formula/gawk.rb b/Library/Formula/gawk.rb
index 052f3bb69..ac68df382 100644
--- a/Library/Formula/gawk.rb
+++ b/Library/Formula/gawk.rb
@@ -5,8 +5,9 @@ class Gawk < Formula
   homepage 'http://www.gnu.org/software/gawk/'
   md5 '52b41c6c4418b3226dfb8f82076193bb'
 
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
   def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
     system "./configure", "--prefix=#{prefix}"
     system "make"
     system "make install"
diff --git a/Library/Formula/gd.rb b/Library/Formula/gd.rb
index 230741b5e..1a37772f6 100644
--- a/Library/Formula/gd.rb
+++ b/Library/Formula/gd.rb
@@ -8,9 +8,10 @@ class Gd < Formula
 
   depends_on 'jpeg' => :recommended
 
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
   def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
-    ENV.libpng
+    ENV.x11
     system "./configure", "--prefix=#{prefix}", "--with-freetype=/usr/X11"
     system "make install"
     (lib+'pkgconfig/gdlib.pc').write pkg_file
diff --git a/Library/Formula/gmp.rb b/Library/Formula/gmp.rb
index 2ab43124e..d2826c9ca 100644
--- a/Library/Formula/gmp.rb
+++ b/Library/Formula/gmp.rb
@@ -12,14 +12,14 @@ class Gmp < Formula
     ]
   end
 
+  fails_with_llvm "Tests fail to compile; missing references in 'llvm bitcode in libtests.a(misc.o)'."
+
   def install
     # Reports of problems using gcc 4.0 on Leopard
     # https://github.com/mxcl/homebrew/issues/issue/2302
     # Also force use of 4.2 on 10.6 in case a user has changed the default
     ENV.gcc_4_2
 
-    fails_with_llvm "Tests fail to compile; missing references in 'llvm bitcode in libtests.a(misc.o)'."
-
     args = ["--prefix=#{prefix}", "--infodir=#{info}", "--enable-cxx"]
 
     if Hardware.is_32_bit? or ARGV.include? "--32-bit"
diff --git a/Library/Formula/gnutls.rb b/Library/Formula/gnutls.rb
index 81bcdae8f..3a4389941 100644
--- a/Library/Formula/gnutls.rb
+++ b/Library/Formula/gnutls.rb
@@ -13,9 +13,9 @@ class Gnutls < Formula
     DATA
   end
 
-  def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
 
+  def install
     ENV.universal_binary	# build fat so wine can use it
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
diff --git a/Library/Formula/google-perftools.rb b/Library/Formula/google-perftools.rb
index 5c7cfb1f3..a76d495fe 100644
--- a/Library/Formula/google-perftools.rb
+++ b/Library/Formula/google-perftools.rb
@@ -5,9 +5,9 @@ class GooglePerftools < Formula
   homepage 'http://code.google.com/p/google-perftools/'
   md5 '7acfee8d3e2ba968d20684e9f7033015'
 
-  def install
-    fails_with_llvm "Segfault during linking", :build => 2326
+  fails_with_llvm "Segfault during linking", :build => 2326
 
+  def install
     ENV.append_to_cflags '-D_XOPEN_SOURCE'
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
diff --git a/Library/Formula/gpgme.rb b/Library/Formula/gpgme.rb
index baecd89aa..cf50b695c 100644
--- a/Library/Formula/gpgme.rb
+++ b/Library/Formula/gpgme.rb
@@ -9,8 +9,9 @@ class Gpgme < Formula
   depends_on 'libgpg-error'
   depends_on 'libassuan'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-asm"
diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
index fe7aea911..be365195e 100644
--- a/Library/Formula/graphicsmagick.rb
+++ b/Library/Formula/graphicsmagick.rb
@@ -33,6 +33,8 @@ class Graphicsmagick < Formula
   depends_on 'ghostscript' => :recommended if ghostscript_srsly? and x11?
   depends_on 'libpng' unless x11?
 
+  fails_with_llvm
+
   def skip_clean? path
     path.extname == '.la'
   end
@@ -46,7 +48,6 @@ class Graphicsmagick < Formula
   end
 
   def install
-    fails_with_llvm
     ENV.libpng
     ENV.O3
 
diff --git a/Library/Formula/guile.rb b/Library/Formula/guile.rb
index 44707c8cc..7ce27c3bd 100644
--- a/Library/Formula/guile.rb
+++ b/Library/Formula/guile.rb
@@ -20,9 +20,9 @@ class Guile < Formula
   # GNU Readline is required; libedit won't work.
   depends_on 'readline'
 
-  def install
-    fails_with_llvm "Segfaults during compilation."
+  fails_with_llvm "Segfaults during compilation."
 
+  def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--with-libreadline-prefix=#{Formula.factory('readline').prefix}"
diff --git a/Library/Formula/id3lib.rb b/Library/Formula/id3lib.rb
index b1fc0b1d6..0e198b423 100644
--- a/Library/Formula/id3lib.rb
+++ b/Library/Formula/id3lib.rb
@@ -10,8 +10,9 @@ class Id3lib < Formula
     {:p1 => DATA }
   end unless ARGV.build_head?
 
+  fails_with_llvm "Segfault during linking", :build => 2326
+
   def install
-    fails_with_llvm "Segfault during linking", :build => 2326
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/igraph.rb b/Library/Formula/igraph.rb
index 60573203d..6aadbbcb9 100644
--- a/Library/Formula/igraph.rb
+++ b/Library/Formula/igraph.rb
@@ -8,9 +8,9 @@ class Igraph < Formula
   depends_on 'glpk'
   depends_on 'gmp'
 
-  def install
-    fails_with_llvm "Segfault while compiling."
+  fails_with_llvm "Segfault while compiling."
 
+  def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
   end
diff --git a/Library/Formula/jasper.rb b/Library/Formula/jasper.rb
index 09db65788..e08b6f6af 100644
--- a/Library/Formula/jasper.rb
+++ b/Library/Formula/jasper.rb
@@ -11,8 +11,9 @@ class Jasper < Formula
     DATA
   end
 
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
   def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--enable-shared",
diff --git a/Library/Formula/jnethack.rb b/Library/Formula/jnethack.rb
index ca6e9eaa8..955babf44 100644
--- a/Library/Formula/jnethack.rb
+++ b/Library/Formula/jnethack.rb
@@ -11,6 +11,8 @@ class Jnethack < Formula
   version '3.4.3-0.10'
   md5 '21479c95990eefe7650df582426457f9'
 
+  fails_with_llvm
+
   # Don't remove save folder
   skip_clean 'libexec/save'
 
@@ -22,7 +24,6 @@ class Jnethack < Formula
   end
 
   def install
-    fails_with_llvm
     # Build everything in-order; no multi builds.
     ENV.deparallelize
 
diff --git a/Library/Formula/john.rb b/Library/Formula/john.rb
index e1468130f..d7d71038b 100644
--- a/Library/Formula/john.rb
+++ b/Library/Formula/john.rb
@@ -9,9 +9,10 @@ class John < Formula
     { :p0 => DATA }
   end
 
+  fails_with_llvm
+
   def install
     ENV.deparallelize
-    fails_with_llvm
     arch = Hardware.is_64_bit? ? '64' : 'sse2'
 
     Dir.chdir 'src' do
diff --git a/Library/Formula/libevent.rb b/Library/Formula/libevent.rb
index 0c6eccc40..d13116f6a 100644
--- a/Library/Formula/libevent.rb
+++ b/Library/Formula/libevent.rb
@@ -6,9 +6,9 @@ class Libevent < Formula
   md5 'a37401d26cbbf28185211d582741a3d4'
   head 'git://levent.git.sourceforge.net/gitroot/levent/levent'
 
-  def install
-    fails_with_llvm "Undefined symbol '_current_base' reported during linking.", :build => 2326
+  fails_with_llvm "Undefined symbol '_current_base' reported during linking.", :build => 2326
 
+  def install
     ENV.j1 # Needed for Mac Pro compilation
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/libexif.rb b/Library/Formula/libexif.rb
index 353c01716..9422a63ea 100644
--- a/Library/Formula/libexif.rb
+++ b/Library/Formula/libexif.rb
@@ -5,8 +5,9 @@ class Libexif < Formula
   homepage 'http://libexif.sourceforge.net/'
   md5 '56144a030a4c875c600b1ccf713f69f7'
 
+  fails_with_llvm "segfault with llvm"
+
   def install
-    fails_with_llvm "segfault with llvm"
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/libsigsegv.rb b/Library/Formula/libsigsegv.rb
index 5d6e362ed..7ee4fc4d7 100644
--- a/Library/Formula/libsigsegv.rb
+++ b/Library/Formula/libsigsegv.rb
@@ -5,9 +5,9 @@ class Libsigsegv < Formula
   homepage 'http://www.gnu.org/software/libsigsegv/'
   md5 'ebe554e26870d8bc200ef3e3539ffd7c'
 
-  def install
-    fails_with_llvm "Fails during configure with LLVM GCC from XCode 4 on Snow Leopard"
+  fails_with_llvm "Fails during configure with LLVM GCC from XCode 4 on Snow Leopard"
 
+  def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make"
diff --git a/Library/Formula/libvirt.rb b/Library/Formula/libvirt.rb
index 498bdee2c..8d59e4e9a 100644
--- a/Library/Formula/libvirt.rb
+++ b/Library/Formula/libvirt.rb
@@ -14,20 +14,18 @@ class Libvirt < Formula
   depends_on "yajl"
 
   if MACOS_VERSION < 10.6
-    # Definitely needed on Leopard, but definitely not Snow Leopard.
-    # Likely also needed on earlier OSX releases, though that hasn't
-    # been tested yet.
+    # Definitely needed on Leopard, but not on Snow Leopard.
     depends_on "readline"
     depends_on "libxml2"
   end
 
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
   def options
     [['--without-libvirtd', 'Build only the virsh client and development libraries.']]
   end
 
   def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
-
     args = ["--prefix=#{prefix}",
             "--localstatedir=#{var}",
             "--mandir=#{man}",
diff --git a/Library/Formula/libxml2.rb b/Library/Formula/libxml2.rb
index 76aef96b8..ac8aa043e 100644
--- a/Library/Formula/libxml2.rb
+++ b/Library/Formula/libxml2.rb
@@ -7,14 +7,14 @@ class Libxml2 < Formula
 
   keg_only :provided_by_osx
 
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
   def options
     # Works with the Python 2 formula
     [['--with-python', 'Compile the libxml2 Python 2.x modules']]
   end
 
   def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
-
     args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
 
     if ARGV.include? '--with-python'
diff --git a/Library/Formula/log4cxx.rb b/Library/Formula/log4cxx.rb
index 2bc14db4c..bdc340a8c 100644
--- a/Library/Formula/log4cxx.rb
+++ b/Library/Formula/log4cxx.rb
@@ -5,8 +5,9 @@ class Log4cxx < Formula
   homepage 'http://logging.apache.org/log4cxx/index.html'
   md5 'b30ffb8da3665178e68940ff7a61084c'
 
+  fails_with_llvm "Fails with \"collect2: ld terminated with signal 11 [Segmentation fault]\"."
+
   def install
-    fails_with_llvm "Fails with \"collect2: ld terminated with signal 11 [Segmentation fault]\"."
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           # Docs won't install on OS X
diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb
index f4da706ce..1d2cf89b8 100644
--- a/Library/Formula/lua.rb
+++ b/Library/Formula/lua.rb
@@ -5,12 +5,12 @@ class Lua < Formula
   homepage 'http://www.lua.org/'
   md5 'd0870f2de55d59c1c8419f36e8fac150'
 
+  fails_with_llvm "Lua itself compiles with llvm, but may fail when other software tries to link."
+
   # Skip cleaning both empty folders and bin/libs so external symbols still work.
   skip_clean :all
 
   def install
-    fails_with_llvm "Lua itself compiles with llvm, but may fail when other software trys to link."
-
     # Apply patch-level 2
     curl "http://www.lua.org/ftp/patch-lua-5.1.4-3", "-O"
     safe_system '/usr/bin/patch', '-d', 'src', '-i', '../patch-lua-5.1.4-3'
diff --git a/Library/Formula/monotone.rb b/Library/Formula/monotone.rb
index c39e7118c..d18789979 100644
--- a/Library/Formula/monotone.rb
+++ b/Library/Formula/monotone.rb
@@ -12,30 +12,23 @@ class Monotone < Formula
   depends_on 'lua'
   depends_on 'pcre'
 
-  def install
-    fails_with_llvm "linker fails"
-
-    def install_body
-      system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
-      system "make install"
-    end
+  fails_with_llvm "linker fails"
 
+  def install
     # Monotone only needs headers from Boost (it's templates all the way down!), so let's avoid
     # building boost (which takes approximately forever) if it's not already installed. This is
     # suggested in the Monotone installation instructions.
 
     boost = Formula.factory('boost')
-    if boost.installed?
-      install_body
-    else
-      monotone_dir = Dir.pwd
+    unless boost.installed?
       # a formula's stage method is private, so we cannot call boost.stage
       boost.brew do
-        boost_dir = Dir.pwd
-        ENV.append "CXXFLAGS", "-I"+boost_dir
-        Dir.chdir monotone_dir
-        install_body
+        ENV.append "CXXFLAGS", "-I"+Dir.pwd
       end
     end
+
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make install"
   end
 end
diff --git a/Library/Formula/mosh.rb b/Library/Formula/mosh.rb
index 1c2d2a185..893a7cce4 100644
--- a/Library/Formula/mosh.rb
+++ b/Library/Formula/mosh.rb
@@ -9,8 +9,9 @@ class Mosh < Formula
   depends_on 'gmp'
   depends_on 'oniguruma'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     ENV.gcc_4_2 # GCC > 4.0 required
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index c09dc776e..2cb913106 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -7,8 +7,9 @@ class MysqlConnectorC < Formula
 
   depends_on 'cmake' => :build
 
+  fails_with_llvm "error: unsupported inline asm"
+
   def install
-    fails_with_llvm "error: unsupported inline asm"
     system "cmake . #{std_cmake_parameters}"
     system 'make'
     ENV.j1
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index e8caf741f..b57d3a2e0 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -8,6 +8,8 @@ class Mysql < Formula
   depends_on 'cmake' => :build
   depends_on 'readline'
 
+  fails_with_llvm "https://github.com/mxcl/homebrew/issues/issue/144"
+
   def options
     [
       ['--with-tests', "Keep tests when installing."],
@@ -21,8 +23,6 @@ class Mysql < Formula
   end
 
   def install
-    fails_with_llvm "https://github.com/mxcl/homebrew/issues/issue/144"
-
     args = [
       ".",
       "-DCMAKE_INSTALL_PREFIX='#{prefix}'",
diff --git a/Library/Formula/nethack.rb b/Library/Formula/nethack.rb
index 456d3054b..16e5d3bc0 100644
--- a/Library/Formula/nethack.rb
+++ b/Library/Formula/nethack.rb
@@ -16,6 +16,8 @@ class Nethack < Formula
   version '3.4.3'
   md5 '21479c95990eefe7650df582426457f9'
 
+  fails_with_llvm
+
   # Don't remove save folder
   skip_clean 'libexec/save'
 
@@ -24,7 +26,6 @@ class Nethack < Formula
   end
 
   def install
-    fails_with_llvm
     # Build everything in-order; no multi builds.
     ENV.deparallelize
 
diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb
index ba03bdc26..7425db500 100644
--- a/Library/Formula/nmap.rb
+++ b/Library/Formula/nmap.rb
@@ -8,8 +8,9 @@ class Nmap < Formula
   # namp needs newer version of openssl on Leopard
   depends_on "openssl" if MACOS_VERSION < 10.6
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     ENV.deparallelize
 
     args = ["--prefix=#{prefix}", "--without-zenmap"]
diff --git a/Library/Formula/node.rb b/Library/Formula/node.rb
index 0a4a80883..f5d760f6e 100644
--- a/Library/Formula/node.rb
+++ b/Library/Formula/node.rb
@@ -6,6 +6,8 @@ class Node < Formula
   homepage 'http://nodejs.org/'
   md5 'a2a6a6699e275a30f6047b1f33281a77'
 
+  fails_with_llvm
+
   # Stripping breaks dynamic loading
   skip_clean :all
 
@@ -14,8 +16,6 @@ class Node < Formula
   end
 
   def install
-    fails_with_llvm
-
     inreplace 'wscript' do |s|
       s.gsub! '/usr/local', HOMEBREW_PREFIX
       s.gsub! '/opt/local/lib', '/usr/lib'
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
index e5a49a336..ca52527dd 100644
--- a/Library/Formula/pango.rb
+++ b/Library/Formula/pango.rb
@@ -8,13 +8,14 @@ class Pango < Formula
   depends_on 'pkg-config' => :build
   depends_on 'glib'
 
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
   if MACOS_VERSION < 10.6
     depends_on 'fontconfig' # Leopard's fontconfig is too old.
     depends_on 'cairo' # Leopard doesn't come with Cairo.
   end
 
   def install
-    fails_with_llvm "Undefined symbols when linking", :build => "2326"
     system "./configure", "--prefix=#{prefix}", "--with-x"
     system "make install"
   end
diff --git a/Library/Formula/pbzip2.rb b/Library/Formula/pbzip2.rb
index 85bcdb24a..d5c24183b 100644
--- a/Library/Formula/pbzip2.rb
+++ b/Library/Formula/pbzip2.rb
@@ -5,9 +5,9 @@ class Pbzip2 < Formula
   homepage 'http://compression.ca/pbzip2/'
   md5 'b354422759da7113da366aad1876ed5d'
 
-  def install
-    fails_with_llvm
+  fails_with_llvm
 
+  def install
     inreplace "Makefile" do |s|
       s.change_make_var! 'PREFIX', prefix
       s.gsub! "/man/", "/share/man/"
diff --git a/Library/Formula/pcre.rb b/Library/Formula/pcre.rb
index 21211105a..0e6a84f4f 100644
--- a/Library/Formula/pcre.rb
+++ b/Library/Formula/pcre.rb
@@ -5,12 +5,13 @@ class Pcre < Formula
   homepage 'http://www.pcre.org/'
   md5 'f14a9fef3c92f3fc6c5ac92d7a2c7eb3'
 
+  fails_with_llvm "Bus error in ld on SL 10.6.4"
+
   def options
     [["--universal", "Build a universal binary."]]
   end
 
   def install
-    fails_with_llvm "Bus error in ld on SL 10.6.4"
     ENV.universal_binary if ARGV.include? "--universal"
 
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/pdflib-lite.rb b/Library/Formula/pdflib-lite.rb
index 6941b6ed0..dfd386bd7 100644
--- a/Library/Formula/pdflib-lite.rb
+++ b/Library/Formula/pdflib-lite.rb
@@ -6,9 +6,9 @@ class PdflibLite < Formula
   md5 '1765de9c5f2b6c5769a2160eaa911e9a'
   version "7.0.4p4"
 
-  def install
-    fails_with_llvm "SL 10.6.1 LLVM crashes with an internal compiler error on this version."
+  fails_with_llvm "SL 10.6.1 LLVM crashes with an internal compiler error on this version."
 
+  def install
     # Without the following substituion, pdflib-lite runs into weird
     # build errors due to bad interactions with the TIFF headers.
     # This workaround comes from the MacPorts.org portfile for pdflib.
diff --git a/Library/Formula/portaudio.rb b/Library/Formula/portaudio.rb
index 783f65e78..4cc4d4e93 100644
--- a/Library/Formula/portaudio.rb
+++ b/Library/Formula/portaudio.rb
@@ -5,16 +5,16 @@ class Portaudio < Formula
   homepage 'http://www.portaudio.com'
   md5 'd2943e4469834b25afe62cc51adc025f'
 
-  def install
-    fails_with_llvm
+  depends_on 'pkg-config' => :build
+
+  fails_with_llvm
 
+  def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
 
     # remove arch flags else we get errors like:
     #   lipo: can't figure out the architecture type
-    ['-arch x86_64', '-arch ppc64', '-arch i386', '-arch ppc'].each do |arch|
-      inreplace "Makefile", arch, ""
-    end
+    inreplace 'Makefile', /-arch (x64_64|ppc64|i386|ppc)/, ''
 
     system "make install"
 
diff --git a/Library/Formula/povray.rb b/Library/Formula/povray.rb
index f83de8090..f319d5f0c 100644
--- a/Library/Formula/povray.rb
+++ b/Library/Formula/povray.rb
@@ -8,9 +8,9 @@ class Povray < Formula
   depends_on 'libtiff' => :optional
   depends_on 'jpeg' => :optional
 
-  def install
-    fails_with_llvm "llvm-gcc: povray fails with 'terminate called after throwing an instance of int'"
+  fails_with_llvm "llvm-gcc: povray fails with 'terminate called after throwing an instance of int'"
 
+  def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "COMPILED_BY=homebrew",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/proj.rb b/Library/Formula/proj.rb
index e28f0f98c..2b43b8196 100644
--- a/Library/Formula/proj.rb
+++ b/Library/Formula/proj.rb
@@ -10,13 +10,13 @@ class Proj < Formula
   homepage 'http://trac.osgeo.org/proj/'
   md5 '927d34623b52e0209ba2bfcca18fe8cd'
 
+  fails_with_llvm
+
   def skip_clean? path
     path.extname == '.la'
   end
 
   def install
-    fails_with_llvm
-
     # The datum grid files are required to support datum shifting
     d = Dir.getwd
     ProjDatumgrid.new.brew { cp Dir["*"], "#{d}/nad/" }
@@ -25,4 +25,3 @@ class Proj < Formula
     system "make install"
   end
 end
-
diff --git a/Library/Formula/pv.rb b/Library/Formula/pv.rb
index 832ee15c0..66a9c00e7 100644
--- a/Library/Formula/pv.rb
+++ b/Library/Formula/pv.rb
@@ -5,8 +5,9 @@ class Pv < Formula
   homepage 'http://www.ivarch.com/programs/pv.shtml'
   md5 '67aedf6dbcd068d5feeaa76156153f4f'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
diff --git a/Library/Formula/redis.rb b/Library/Formula/redis.rb
index fdcbd4d9b..734317bbc 100644
--- a/Library/Formula/redis.rb
+++ b/Library/Formula/redis.rb
@@ -6,9 +6,9 @@ class Redis < Formula
   homepage 'http://redis.io/'
   sha1 '75b953e4a3067570555c5f3f5e8f481c40489904'
 
-  def install
-    fails_with_llvm "Fails with \"reference out of range from _linenoise\""
+  fails_with_llvm "Fails with \"reference out of range from _linenoise\""
 
+  def install
     # Architecture isn't detected correctly on 32bit Snow Leopard without help
     ENV["OBJARCH"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
 
diff --git a/Library/Formula/redland.rb b/Library/Formula/redland.rb
index 720b83508..081231c82 100644
--- a/Library/Formula/redland.rb
+++ b/Library/Formula/redland.rb
@@ -10,11 +10,11 @@ class Redland < Formula
   depends_on 'rasqal'
   depends_on 'berkeley-db' => :optional
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--with-sqlite=yes",
                           "--with-mysql=no",
                           "--with-bdb=#{HOMEBREW_PREFIX}"
diff --git a/Library/Formula/ruby-enterprise-edition.rb b/Library/Formula/ruby-enterprise-edition.rb
index 76a3b5b38..4dff3c04f 100644
--- a/Library/Formula/ruby-enterprise-edition.rb
+++ b/Library/Formula/ruby-enterprise-edition.rb
@@ -7,6 +7,8 @@ class RubyEnterpriseEdition < Formula
 
   depends_on 'readline'
 
+  fails_with_llvm "fails with LLVM"
+
   skip_clean 'bin/ruby'
 
   def options
@@ -16,7 +18,6 @@ class RubyEnterpriseEdition < Formula
   def install
     readline = Formula.factory('readline').prefix
 
-    fails_with_llvm "fails with LLVM"
     args = ['./installer', "--auto", prefix, '--no-tcmalloc']
     args << '-c' << '--enable-shared' if ARGV.include? '--enable-shared'
     # Configure will complain that this is an unknown option, but it is actually OK
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index fcf72ea75..f18a8f03d 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -9,6 +9,11 @@ class Ruby < Formula
   depends_on 'readline'
   depends_on 'libyaml'
 
+  fails_with_llvm
+
+  # Stripping breaks dynamic linking
+  skip_clean :all
+
   def options
     [
       ["--with-suffix", "Add a 19 suffix to commands"],
@@ -17,12 +22,7 @@ class Ruby < Formula
     ]
   end
 
-  # Stripping breaks dynamic linking
-  skip_clean :all
-
   def install
-    fails_with_llvm
-
     ruby_lib = HOMEBREW_PREFIX+"lib/ruby"
 
     if File.exist? ruby_lib and File.symlink? ruby_lib
diff --git a/Library/Formula/sbcl.rb b/Library/Formula/sbcl.rb
index 7cc78c08b..c6806b824 100644
--- a/Library/Formula/sbcl.rb
+++ b/Library/Formula/sbcl.rb
@@ -12,6 +12,8 @@ class Sbcl < Formula
   md5 '83f094aa36edce2d69214330890f05e5'
   head 'git://sbcl.boinkor.net/sbcl.git'
 
+  fails_with_llvm "Compilation fails with LLVM."
+
   skip_clean 'bin'
   skip_clean 'lib'
 
@@ -39,7 +41,6 @@ class Sbcl < Formula
   end
 
   def install
-    fails_with_llvm "Compilation fails with LLVM."
     write_features
 
     build_directory = Dir.pwd
diff --git a/Library/Formula/silk.rb b/Library/Formula/silk.rb
index c8a41c7f5..766807e89 100644
--- a/Library/Formula/silk.rb
+++ b/Library/Formula/silk.rb
@@ -10,9 +10,9 @@ class Silk < Formula
   depends_on 'libfixbuf'
   depends_on 'yaf'
 
-  def install
-    fails_with_llvm "Undefined symbols during compile"
+  fails_with_llvm "Undefined symbols during compile"
 
+  def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
diff --git a/Library/Formula/sphinx.rb b/Library/Formula/sphinx.rb
index 63749abd7..1f4bda74d 100644
--- a/Library/Formula/sphinx.rb
+++ b/Library/Formula/sphinx.rb
@@ -6,15 +6,15 @@ class Sphinx < Formula
   md5 '7b9b618cb9b378f949bb1b91ddcc4f54'
   head 'http://sphinxsearch.googlecode.com/svn/trunk/'
 
-  def install
-    fails_with_llvm "fails with: ld: rel32 out of range in _GetPrivateProfileString from /usr/lib/libodbc.a(SQLGetPrivateProfileString.o)"
+  fails_with_llvm "fails with: ld: rel32 out of range in _GetPrivateProfileString from /usr/lib/libodbc.a(SQLGetPrivateProfileString.o)"
 
-    config_args = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"]
+  def install
+    args = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"]
     # configure script won't auto-select PostgreSQL
-    config_args << "--with-pgsql" if `/usr/bin/which pg_config`.size > 0
-    config_args << "--without-mysql" if `/usr/bin/which mysql`.size <= 0
+    args << "--with-pgsql" if `/usr/bin/which pg_config`.size > 0
+    args << "--without-mysql" if `/usr/bin/which mysql`.size <= 0
 
-    system "./configure", *config_args
+    system "./configure", *args
     system "make install"
   end
 
diff --git a/Library/Formula/spin.rb b/Library/Formula/spin.rb
index c4dc8a3e9..62a9bd432 100644
--- a/Library/Formula/spin.rb
+++ b/Library/Formula/spin.rb
@@ -6,12 +6,13 @@ class Spin < Formula
   md5 '03345f9713e7b4f82d2d8ec319802b9c'
   version '5.2.5'
 
+  fails_with_llvm
+
   def patches
     DATA
   end
 
   def install
-    fails_with_llvm
     ENV.deparallelize
 
     # Compile and install the binary.
diff --git a/Library/Formula/streamripper.rb b/Library/Formula/streamripper.rb
index ace10bbe2..0d565f3da 100644
--- a/Library/Formula/streamripper.rb
+++ b/Library/Formula/streamripper.rb
@@ -7,8 +7,9 @@ class Streamripper < Formula
 
   depends_on 'glib'
 
+  fails_with_llvm "strange runtime errors with llvm"
+
   def install
-    fails_with_llvm "strange runtime errors with llvm"
     File.chmod 0755, "./install-sh" # without this 'make install' doesn't seem to work (permission denied)
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb
index fe40f3dc0..c7647284c 100644
--- a/Library/Formula/swi-prolog.rb
+++ b/Library/Formula/swi-prolog.rb
@@ -6,7 +6,7 @@ class SwiProlog < Formula
   homepage 'http://www.swi-prolog.org/'
   md5 '7973bcfd3854ae0cb647cc62f2faabcf'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'readline'
   depends_on 'gmp'
   depends_on 'jpeg'
@@ -17,14 +17,14 @@ class SwiProlog < Formula
   depends_on 'fontconfig' if MACOS_VERSION < 10.6
   depends_on 'expat' if MACOS_VERSION < 10.6
 
+  fails_with_llvm "Exported procedure chr_translate:chr_translate_line_info/3 is not defined"
+
   def options
     [['--lite', "Don't install any packages; overrides --with-jpl"],
      ['--without-jpl', "Include JPL, the Java-Prolog Bridge"]]
   end
 
   def install
-    fails_with_llvm "Exported procedure chr_translate:chr_translate_line_info/3 is not defined"
-
     args = ["--prefix=#{prefix}", "--mandir=#{man}"]
     ENV.append 'DISABLE_PKGS', "jpl" if ARGV.include? "--without-jpl"
 
diff --git a/Library/Formula/syck.rb b/Library/Formula/syck.rb
index e6c541125..d49d9e71c 100644
--- a/Library/Formula/syck.rb
+++ b/Library/Formula/syck.rb
@@ -5,8 +5,9 @@ class Syck < Formula
   homepage 'https://wiki.github.com/indeyets/syck/'
   md5 '198f925b4ed7fe04a182c35014498634'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/tesseract.rb b/Library/Formula/tesseract.rb
index 382569213..174ec3394 100644
--- a/Library/Formula/tesseract.rb
+++ b/Library/Formula/tesseract.rb
@@ -13,9 +13,9 @@ class Tesseract < Formula
 
   depends_on 'libtiff'
 
-  def install
-    fails_with_llvm "Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc", :build => "2206"
+  fails_with_llvm "Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc", :build => "2206"
 
+  def install
     # 'make install' expects the language data files in the build directory
     d = Dir.getwd
     TesseractEnglishData.new.brew { cp Dir["*"], "#{d}/tessdata/" }
diff --git a/Library/Formula/ufraw.rb b/Library/Formula/ufraw.rb
index 2f58d2716..fa491f860 100644
--- a/Library/Formula/ufraw.rb
+++ b/Library/Formula/ufraw.rb
@@ -13,8 +13,9 @@ class Ufraw < Formula
   depends_on 'dcraw'
   depends_on 'exiv2' => :optional
 
+  fails_with_llvm "Compiling with LLVM gives a segfault while linking."
+
   def install
-    fails_with_llvm "Compiling with LLVM gives a segfault while linking."
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--without-gtk",
diff --git a/Library/Formula/unittest.rb b/Library/Formula/unittest.rb
index 7b837ec12..a70b9cc00 100644
--- a/Library/Formula/unittest.rb
+++ b/Library/Formula/unittest.rb
@@ -5,8 +5,9 @@ class Unittest < Formula
   homepage 'http://unittest.red-bean.com/'
   md5 'e77615162141b23a78adcda929d58d61'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb
index c56711f90..3bb02ccdf 100644
--- a/Library/Formula/valgrind.rb
+++ b/Library/Formula/valgrind.rb
@@ -8,17 +8,15 @@ class Valgrind < Formula
 
   depends_on 'pkg-config' => :build
 
+  fails_with_llvm "Makes applications segfault on startup", :build => 2326
+
   skip_clean 'lib'
 
   def install
-    fails_with_llvm "Makes applications segfault on startup", :build => 2326
-
     system "./autogen.sh" if File.exists? "autogen.sh"
 
     args = ["--prefix=#{prefix}", "--mandir=#{man}"]
-    if MacOS.prefer_64_bit?
-      args << "--enable-only64bit" << "--build=amd64-darwin"
-    end
+    args << "--enable-only64bit" << "--build=amd64-darwin" if MacOS.prefer_64_bit?
 
     system "./configure", *args
     system "make install"
diff --git a/Library/Formula/visualboyadvance.rb b/Library/Formula/visualboyadvance.rb
index c95aa312c..94bdf42c2 100644
--- a/Library/Formula/visualboyadvance.rb
+++ b/Library/Formula/visualboyadvance.rb
@@ -8,10 +8,11 @@ class Visualboyadvance < Formula
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
 
+  fails_with_llvm "Video scalers don't link with LLVM."
+
   def patches; DATA; end
 
   def install
-    fails_with_llvm "Video scalers don't link with LLVM."
     ENV.x11 # for libpng
 
     system "./configure", "--disable-dependency-tracking", "--disable-debug",
diff --git a/Library/Formula/vpnc.rb b/Library/Formula/vpnc.rb
index 553f1fd03..5cc2628bc 100644
--- a/Library/Formula/vpnc.rb
+++ b/Library/Formula/vpnc.rb
@@ -8,6 +8,8 @@ class Vpnc < Formula
   depends_on 'libgcrypt'
   depends_on 'libgpg-error'
 
+  fails_with_llvm
+
   skip_clean 'etc'
   skip_clean 'var'
 
@@ -16,7 +18,6 @@ class Vpnc < Formula
   end
 
   def install
-    fails_with_llvm
     ENV.no_optimization
     ENV.deparallelize
 
diff --git a/Library/Formula/w3m.rb b/Library/Formula/w3m.rb
index 987e51bdc..7361859e6 100644
--- a/Library/Formula/w3m.rb
+++ b/Library/Formula/w3m.rb
@@ -7,8 +7,9 @@ class W3m < Formula
 
   depends_on 'bdw-gc'
 
+  fails_with_llvm
+
   def install
-    fails_with_llvm
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-image"
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 3e23df7b0..119d77536 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -17,6 +17,8 @@ class Wine < Formula
   depends_on 'libicns'
   depends_on 'gnutls'
 
+  fails_with_llvm
+
   # the following libraries are currently not specified as dependencies, or not built as 32-bit:
   # configure: libsane, libv4l, libgphoto2, liblcms, gstreamer-0.10, libcapi20, libgsm, libtiff
 
@@ -32,7 +34,6 @@ EOS
   end
 
   def install
-    fails_with_llvm
     ENV.x11
 
     # Build 32-bit; Wine doesn't support 64-bit host builds on OS X.
diff --git a/Library/Formula/yaf.rb b/Library/Formula/yaf.rb
index dae8ad1c8..868d905f7 100644
--- a/Library/Formula/yaf.rb
+++ b/Library/Formula/yaf.rb
@@ -9,9 +9,9 @@ class Yaf < Formula
   depends_on 'glib'
   depends_on 'libfixbuf'
 
-  def install
-    fails_with_llvm "Undefined symbols during compile"
+  fails_with_llvm "Undefined symbols during compile"
 
+  def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}"
diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb
index d5ebffda4..a697da29f 100644
--- a/Library/Formula/zeromq.rb
+++ b/Library/Formula/zeromq.rb
@@ -6,6 +6,8 @@ class Zeromq < Formula
   homepage 'http://www.zeromq.org/'
   md5 'ae681af2df1b7191aeecfcb23bb73864'
 
+  fails_with_llvm "Compiling with LLVM gives a segfault while linking."
+
   def options
     [['--universal', 'Build as a Universal Intel binary.']]
   end
@@ -29,8 +31,6 @@ class Zeromq < Formula
   end
 
   def install
-    fails_with_llvm "Compiling with LLVM gives a segfault while linking."
-
     system "./autogen.sh" if ARGV.build_head?
 
     if ARGV.include? '--universal'