Use ARGV.build_universal?

21 files changed, 22 insertions, 22 deletions

diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index a7392cb50..a7f8f515d 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -15,7 +15,7 @@ class Boost < Formula
   fails_with_llvm "LLVM-GCC causes errors with dropped arguments to functions when linking with boost"
 
   def install
-    if ARGV.include? "--universal"
+    if ARGV.build_universal?
       archs = archs_for_command("python")
       unless archs.universal?
         opoo "A universal build was requested, but Python is not a universal build"
diff --git a/Library/Formula/bullet.rb b/Library/Formula/bullet.rb
index 0633a8832..939054a86 100644
--- a/Library/Formula/bullet.rb
+++ b/Library/Formula/bullet.rb
@@ -29,7 +29,7 @@ class Bullet < Formula
       args << "-DCMAKE_INSTALL_PREFIX=#{prefix}"
     end
 
-    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if ARGV.include? "--universal"
+    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if ARGV.build_universal?
     args << "-DBUILD_DEMOS=OFF" if not ARGV.include? "--build-demo"
     args << "-DBUILD_EXTRAS=OFF" if not ARGV.include? "--build-extra"
 
diff --git a/Library/Formula/check.rb b/Library/Formula/check.rb
index 01e7bea14..51902cec3 100644
--- a/Library/Formula/check.rb
+++ b/Library/Formula/check.rb
@@ -10,7 +10,7 @@ class Check < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/exodriver.rb b/Library/Formula/exodriver.rb
index 982f16d99..82bd10d6a 100644
--- a/Library/Formula/exodriver.rb
+++ b/Library/Formula/exodriver.rb
@@ -22,7 +22,7 @@ class Exodriver < Formula
       s.change_make_var! 'HEADER_DESTINATION', include
     end
 
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/geoip.rb b/Library/Formula/geoip.rb
index 4715aadff..f9e59368b 100644
--- a/Library/Formula/geoip.rb
+++ b/Library/Formula/geoip.rb
@@ -10,7 +10,7 @@ class Geoip < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/gsl.rb b/Library/Formula/gsl.rb
index e22173297..3910c7ee3 100644
--- a/Library/Formula/gsl.rb
+++ b/Library/Formula/gsl.rb
@@ -10,7 +10,7 @@ class Gsl < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
 
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make" # A GNU tool which doesn't support just make install! Shameful!
diff --git a/Library/Formula/libusb.rb b/Library/Formula/libusb.rb
index d2c06cd82..fa3986d5f 100644
--- a/Library/Formula/libusb.rb
+++ b/Library/Formula/libusb.rb
@@ -10,7 +10,7 @@ class Libusb < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index ed3fcd951..955fa3517 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 def build_clang?; ARGV.include? '--with-clang'; end
-def build_universal?; ARGV.include? '--universal'; end
+def build_universal?; ARGV.build_universal?; end
 def build_shared?; ARGV.include? '--shared'; end
 def build_rtti?; ARGV.include? '--rtti'; end
 
diff --git a/Library/Formula/mcrypt.rb b/Library/Formula/mcrypt.rb
index da532626a..d9ad359c9 100644
--- a/Library/Formula/mcrypt.rb
+++ b/Library/Formula/mcrypt.rb
@@ -10,7 +10,7 @@ class Mcrypt < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 0d7e776ce..3257fda02 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -49,7 +49,7 @@ class Mysql < Formula
     args << "-DWITH_EMBEDDED_SERVER=ON" if ARGV.include? '--with-embedded'
 
     # Make universal for binding to universal applications
-    args << "-DCMAKE_OSX_ARCHITECTURES='ppc;i386'" if ARGV.include? '--universal'
+    args << "-DCMAKE_OSX_ARCHITECTURES='ppc;i386'" if ARGV.build_universal?
 
     # Build with local infile loading support
     args << "-DENABLED_LOCAL_INFILE=1" if ARGV.include? '--enable-local-infile'
diff --git a/Library/Formula/neon.rb b/Library/Formula/neon.rb
index 19a147c2d..a903da94d 100644
--- a/Library/Formula/neon.rb
+++ b/Library/Formula/neon.rb
@@ -15,7 +15,7 @@ class Neon < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? '--universal'
+    ENV.universal_binary if ARGV.build_universal?
 
     system "./configure", "--prefix=#{prefix}",
                           "--disable-debug",
diff --git a/Library/Formula/openssl.rb b/Library/Formula/openssl.rb
index 90f20b46e..612a51a7b 100644
--- a/Library/Formula/openssl.rb
+++ b/Library/Formula/openssl.rb
@@ -14,7 +14,7 @@ class Openssl < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     ENV.j1 # Breaks on Mac Pro
     system "./config", "--prefix=#{prefix}",
                        "--openssldir=#{etc}",
diff --git a/Library/Formula/pcre.rb b/Library/Formula/pcre.rb
index 0e6a84f4f..35605efdb 100644
--- a/Library/Formula/pcre.rb
+++ b/Library/Formula/pcre.rb
@@ -12,7 +12,7 @@ class Pcre < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
 
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/protobuf.rb b/Library/Formula/protobuf.rb
index 38273aeb1..df61a9584 100644
--- a/Library/Formula/protobuf.rb
+++ b/Library/Formula/protobuf.rb
@@ -12,7 +12,7 @@ class Protobuf < Formula
   end
 
   def install
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--with-zlib"
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 79d84ad21..58a678903 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -47,7 +47,7 @@ class Python < Formula
 
     args = ["--prefix=#{prefix}"]
 
-    if ARGV.include? '--universal'
+    if ARGV.build_universal?
       args << "--enable-universalsdk=/" << "--with-universal-archs=intel"
     end
 
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index 2f923009e..d216bd0c5 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -54,7 +54,7 @@ class Python3 < Formula
     # Both gcc and LLVM support this, so switch it on.
     args = ["--prefix=#{prefix}", "--with-computed-gotos"]
 
-    if ARGV.include? '--universal'
+    if ARGV.build_universal?
       args << "--enable-universalsdk=/" << "--with-universal-archs=intel"
     end
 
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index f61ec1ac2..e40e5bd3c 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -57,11 +57,11 @@ class Qt < Formula
       args << "-nomake" << "demos" << "-nomake" << "examples"
     end
 
-    if MacOS.prefer_64_bit? or ARGV.include? '--universal'
+    if MacOS.prefer_64_bit? or ARGV.build_universal?
       args << '-arch' << 'x86_64'
     end
 
-    if !MacOS.prefer_64_bit? or ARGV.include? '--universal'
+    if !MacOS.prefer_64_bit? or ARGV.build_universal?
       args << '-arch' << 'x86'
     end
 
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index f18a8f03d..ee9b927bc 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -49,7 +49,7 @@ class Ruby < Formula
             "--enable-shared"]
 
     args << "--program-suffix=19" if ARGV.include? "--with-suffix"
-    args << "--with-arch=x86_64,i386" if ARGV.include? "--universal"
+    args << "--with-arch=x86_64,i386" if ARGV.build_universal?
 
     # Put gem, site and vendor folders in the HOMEBREW_PREFIX
 
diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index dbba42c59..4b43faf62 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -17,7 +17,7 @@ class Sqlite < Formula
   def install
     ENV.append "CFLAGS", "-DSQLITE_ENABLE_RTREE=1" if ARGV.include? "--with-rtree"
     ENV.append "CPPFLAGS","-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if ARGV.include? "--with-fts"
-    ENV.universal_binary if ARGV.include? "--universal"
+    ENV.universal_binary if ARGV.build_universal?
     system "./configure", "--prefix=#{prefix}",
                           "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 09e33cfff..b70255eb3 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -4,7 +4,7 @@ def build_java?; ARGV.include? "--java"; end
 def build_perl?; ARGV.include? "--perl"; end
 def build_python?; ARGV.include? "--python"; end
 def build_ruby?; ARGV.include? "--ruby"; end
-def build_universal?; ARGV.include? '--universal'; end
+def build_universal?; ARGV.build_universal?; end
 def with_unicode_path?; ARGV.include? '--unicode-path'; end
 
 # On 10.5 we need newer versions of apr, neon etc.
diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb
index e686adfe8..f2631d557 100644
--- a/Library/Formula/zeromq.rb
+++ b/Library/Formula/zeromq.rb
@@ -33,7 +33,7 @@ class Zeromq < Formula
   def install
     system "./autogen.sh" if ARGV.build_head?
 
-    if ARGV.include? '--universal'
+    if ARGV.build_universal?
       build_fat
     else
       system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--with-pgm"