Add MacOS.preferred_arch

Replaced the plethora of ternaries we've used all over the place to
determine whether x86_64 or i386 is called for.

Formula/botan.rb

@@ -9,7 +9,7 @@ class Botan < Formula
 
   def install
     args = ["--prefix=#{prefix}"]
-    args << "--cpu=x86_64" if MacOS.prefer_64_bit?
+    args << "--cpu=#{MacOS.preferred_arch}"
     args << "--enable-debug" if build.include? "enable-debug"
     args << "--cc=#{ENV.compiler}"
 

Formula/duti.rb

@@ -14,8 +14,7 @@ class Duti < Formula
 
   def install
     system "./configure", "--prefix=#{prefix}"
-    real_arch = MacOS.prefer_64_bit? ? "x86_64" : "i386"
-    inreplace "Makefile", "@@ARCH@@", real_arch
+    inreplace "Makefile", "@@ARCH@@", MacOS.preferred_arch
     system "make install"
   end
 

Formula/fontforge.rb

@@ -52,7 +52,7 @@ class Fontforge < Formula
     ENV.append "LDFLAGS", "-lintl"
 
     # Reset ARCHFLAGS to match how we build
-    ENV["ARCHFLAGS"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
+    ENV["ARCHFLAGS"] = "-arch #{MacOS.preferred_arch}"
 
     # Set up framework paths so FlatCarbon replacement paths work (see below)
     ENV.append "CFLAGS", "-F#{MacOS.sdk_path}/System/Library/Frameworks/CoreServices.framework/Frameworks"

Formula/gdal.rb

@@ -195,11 +195,7 @@ class Gdal < Formula
     ENV.libxml2 if build.include? 'complete'
 
     # Reset ARCHFLAGS to match how we build.
-    if MacOS.prefer_64_bit?
-      ENV['ARCHFLAGS'] = "-arch x86_64"
-    else
-      ENV['ARCHFLAGS'] = "-arch i386"
-    end
+    ENV['ARCHFLAGS'] = "-arch #{MacOS.preferred_arch}"
 
     # Fix hardcoded mandir: http://trac.osgeo.org/gdal/ticket/5092
     inreplace 'configure', %r[^mandir='\$\{prefix\}/man'$], ''

Formula/gle.rb

@@ -12,9 +12,8 @@ class Gle < Formula
   depends_on 'libtiff' => :optional
 
   def install
-    arch = MacOS.prefer_64_bit? ? "x86_64" : "i386"
     system "./configure", "--prefix=#{prefix}",
-                          "--with-arch=#{arch}",
+                          "--with-arch=#{MacOS.preferred_arch}",
                           "--without-qt"
 
     inreplace 'Makefile', "MKDIR_P", "mkdir -p"

Formula/grass.rb

@@ -75,12 +75,8 @@ class Grass < Formula
       args << "--with-wxwidgets=#{Formula.factory('wxmac').opt_prefix}/bin/wx-config"
     end
 
-    if MacOS.prefer_64_bit?
-      args << "--enable-64bit"
-      args << "--with-macosx-archs=x86_64"
-    else
-      args << "--with-macosx-archs=i386"
-    end
+    args << "--enable-64bit" if MacOS.prefer_64_bit?
+    args << "--with-macos-archs=#{MacOS.preferred_arch}"
 
     # Deal with Cairo support
     if MacOS.version <= :leopard

Formula/hiredis.rb

@@ -7,7 +7,7 @@ class Hiredis < Formula
 
   def install
     # Architecture isn't detected correctly on 32bit Snow Leopard without help
-    ENV["OBJARCH"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
+    ENV["OBJARCH"] = "-arch #{MacOS.preferred_arch}"
 
     system "make", "install", "PREFIX=#{prefix}"
   end

Formula/jsvc.rb

@@ -12,9 +12,8 @@ class Jsvc < Formula
   end
 
   def install
-    arch = Hardware.is_64_bit? ? "-arch x86_64" : "-arch i386"
-    ENV.append "CFLAGS", arch
-    ENV.append "LDFLAGS", arch
+    ENV.append "CFLAGS", MacOS.preferred_arch
+    ENV.append "LDFLAGS", MacOS.preferred_arch
     ENV.append "CPPFLAGS", "-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers"
 
     prefix.install %w{ NOTICE.txt LICENSE.txt RELEASE-NOTES.txt }

Formula/macvim.rb

@@ -22,8 +22,7 @@ class Macvim < Formula
     # Set ARCHFLAGS so the Python app (with C extension) that is
     # used to create the custom icons will not try to compile in
     # PPC support (which isn't needed in Homebrew-supported systems.)
-    arch = MacOS.prefer_64_bit? ? 'x86_64' : 'i386'
-    ENV['ARCHFLAGS'] = "-arch #{arch}"
+    ENV['ARCHFLAGS'] = "-arch #{MacOS.preferred_arch}"
 
     # If building for 10.7 or up, make sure that CC is set to "clang".
     ENV.clang if MacOS.version >= :lion

Formula/postgresql.rb

@@ -60,14 +60,14 @@ class Postgresql < Formula
       ENV.append 'LIBS', `uuid-config --libs`.strip
     end
 
-    if build.with? 'python' and MacOS.prefer_64_bit? and not build.build_32_bit?
-      args << "ARCHFLAGS='-arch x86_64'"
+    if build.with? 'python'
+      args << "ARCHFLAGS='-arch #{MacOS.preferred_arch}'"
       check_python_arch
     end
 
     if build.build_32_bit?
-      ENV.append 'CFLAGS', '-arch i386'
-      ENV.append 'LDFLAGS', '-arch i386'
+      ENV.append 'CFLAGS', "-arch #{MacOS.preferred_arch}"
+      ENV.append 'LDFLAGS', "-arch #{MacOS.preferred_arch}"
     end
 
     system "./configure", *args

Formula/py2cairo.rb

@@ -19,13 +19,7 @@ class Py2cairo < Formula
 
   def install
     # Python extensions default to universal but cairo may not be universal
-    unless build.universal?
-      ENV['ARCHFLAGS'] = if MacOS.prefer_64_bit?
-        "-arch x86_64"
-      else
-        "-arch i386"
-      end
-    end
+    ENV['ARCHFLAGS'] = "-arch #{MacOS.preferred_arch}" unless build.universal?
 
     python do
       # waf miscompiles py2cairo on >= lion with HB python, linking the wrong

Formula/redis.rb

@@ -14,7 +14,7 @@ class Redis < Formula
 
   def install
     # Architecture isn't detected correctly on 32bit Snow Leopard without help
-    ENV["OBJARCH"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
+    ENV["OBJARCH"] = "-arch #{MacOS.preferred_arch}"
 
     # Head and stable have different code layouts
     src = (buildpath/'src/Makefile').exist? ? buildpath/'src' : buildpath

Formula/rrdtool.rb

@@ -36,7 +36,7 @@ class Rrdtool < Formula
     system "./configure", *args
 
     # Needed to build proper Ruby bundle
-    ENV["ARCHFLAGS"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
+    ENV["ARCHFLAGS"] = "-arch #{MacOS.preferred_arch}"
 
     system "make install"
     prefix.install "bindings/ruby/test.rb"

Formula/uwsgi.rb

@@ -11,8 +11,7 @@ class Uwsgi < Formula
 
   def install
     python do
-      arch = MacOS.prefer_64_bit? ? 'x86_64' : 'i386'
-      %w{CFLAGS LDFLAGS}.each { |e| ENV.append e, "-arch #{arch}" }
+      %w{CFLAGS LDFLAGS}.each { |e| ENV.append e, "-arch #{MacOS.preferred_arch}" }
 
       system python, "uwsgiconfig.py", "--build"
       bin.install "uwsgi"

Formula/wxmac.rb

@@ -36,7 +36,7 @@ class Wxmac < Formula
       "BUILD_STC=1"
     ]
     cd "wxPython" do
-      ENV.append_to_cflags '-arch x86_64' if MacOS.prefer_64_bit?
+      ENV.append_to_cflags "-arch #{MacOS.preferred_arch}"
 
       python do
         system python, "setup.py",