11 files changed, 11 insertions, 11 deletions
diff --git a/Library/Formula/bullet.rb b/Library/Formula/bullet.rb
index bbdf095b1..cc781cf25 100644
--- a/Library/Formula/bullet.rb
+++ b/Library/Formula/bullet.rb
@@ -27,7 +27,7 @@ class Bullet < Formula
       args << "-DCMAKE_INSTALL_PREFIX=#{prefix}"
     end
 
-    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
+    args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}" if build.universal?
     args << "-DBUILD_DEMOS=OFF" if not build.include? "build-demo"
     args << "-DBUILD_EXTRAS=OFF" if not build.include? "build-extra"
 
diff --git a/Library/Formula/libfreenect.rb b/Library/Formula/libfreenect.rb
index 60154b61f..0d1b0cbeb 100644
--- a/Library/Formula/libfreenect.rb
+++ b/Library/Formula/libfreenect.rb
@@ -15,7 +15,7 @@ class Libfreenect < Formula
   def install
     if build.universal?
       ENV.universal_binary
-      ENV['CMAKE_OSX_ARCHITECTURES'] = "i386;x86_64"
+      ENV['CMAKE_OSX_ARCHITECTURES'] = Hardware::CPU.universal_archs.as_cmake_arch_flags
     end
     mkdir "build" do
       system "cmake", "..", *std_cmake_args
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index aa3456203..49047b4f6 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -56,7 +56,7 @@ class Llvm < Formula
 
     if build.universal?
       ENV['UNIVERSAL'] = '1'
-      ENV['UNIVERSAL_ARCH'] = 'i386 x86_64'
+      ENV['UNIVERSAL_ARCH'] = Hardware::CPU.universal_archs.join(' ')
     end
 
     ENV['REQUIRES_RTTI'] = '1' if build.include? 'rtti'
diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb
index 9d55b031f..1927154e2 100644
--- a/Library/Formula/mariadb.rb
+++ b/Library/Formula/mariadb.rb
@@ -79,7 +79,7 @@ class Mariadb < Formula
     cmake_args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.include? 'with-blackhole-storage-engine'
 
     # Make universal for binding to universal applications
-    cmake_args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
+    cmake_args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?
 
     # Build with local infile loading support
     cmake_args << "-DENABLED_LOCAL_INFILE=1" if build.include? 'enable-local-infile'
diff --git a/Library/Formula/mysql-cluster.rb b/Library/Formula/mysql-cluster.rb
index a1d063b14..87e624f64 100644
--- a/Library/Formula/mysql-cluster.rb
+++ b/Library/Formula/mysql-cluster.rb
@@ -74,7 +74,7 @@ class MysqlCluster < Formula
     args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.include? 'with-blackhole-storage-engine'
 
     # Make universal for binding to universal applications
-    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
+    args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?
 
     # Build with local infile loading support
     args << "-DENABLED_LOCAL_INFILE=1" if build.include? 'enable-local-infile'
diff --git a/Library/Formula/mysql-connector-odbc.rb b/Library/Formula/mysql-connector-odbc.rb
index c4ece20ae..9121e5de2 100644
--- a/Library/Formula/mysql-connector-odbc.rb
+++ b/Library/Formula/mysql-connector-odbc.rb
@@ -14,7 +14,7 @@ class MysqlConnectorOdbc < Formula
 
   def install
     args = ["-DCMAKE_INSTALL_PREFIX=#{prefix}"]
-    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
+    args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?
     args << "-DMYSQL_LIB:FILEPATH=#{HOMEBREW_PREFIX}/lib/libmysqlclient_r.a"
     ENV['MYSQL_DIR'] = HOMEBREW_PREFIX
     system 'cmake', ".", *args
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 8f3550c3c..b01eb56e8 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -85,7 +85,7 @@ class Mysql < Formula
     args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.include? 'with-blackhole-storage-engine'
 
     # Make universal for binding to universal applications
-    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
+    args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?
 
     # Build with local infile loading support
     args << "-DENABLED_LOCAL_INFILE=1" if build.include? 'enable-local-infile'
diff --git a/Library/Formula/percona-server.rb b/Library/Formula/percona-server.rb
index 048f640bc..db775861f 100644
--- a/Library/Formula/percona-server.rb
+++ b/Library/Formula/percona-server.rb
@@ -81,7 +81,7 @@ class PerconaServer < Formula
     args << "-DWITH_READLINE=yes" unless build.include? 'with-libedit'
 
     # Make universal for binding to universal applications
-    args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
+    args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?
 
     # Build with local infile loading support
     args << "-DENABLED_LOCAL_INFILE=1" if build.include? 'enable-local-infile'
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index 725816b71..334a5be34 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -35,7 +35,7 @@ class Ruby < Formula
 
     args = %W[--prefix=#{prefix} --enable-shared]
     args << "--program-suffix=20" if build.with? "suffix"
-    args << "--with-arch=x86_64,i386" if build.universal?
+    args << "--with-arch=#{Hardware::CPU.universal_archs.join(',')}" if build.universal?
     args << "--with-out-ext=tk" unless build.with? "tcltk"
     args << "--disable-install-doc" unless build.with? "doc"
     args << "--disable-dtrace" unless MacOS::CLT.installed?
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 5ad07ed81..bdae0cc68 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -122,7 +122,7 @@ class Subversion < Formula
     if build.include? 'perl'
       # Remove hard-coded ppc target, add appropriate ones
       if build.universal?
-        arches = "-arch x86_64 -arch i386"
+        arches = Hardware::CPU.universal_archs.as_arch_flags
       elsif MacOS.version <= :leopard
         arches = "-arch #{Hardware::CPU.arch_32_bit}"
       else
diff --git a/Library/Formula/zookeeper.rb b/Library/Formula/zookeeper.rb
index cfb048d00..18c8fdb69 100644
--- a/Library/Formula/zookeeper.rb
+++ b/Library/Formula/zookeeper.rb
@@ -48,7 +48,7 @@ class Zookeeper < Formula
     if Hardware.is_32_bit?
       ENV['ARCHFLAGS'] = "-arch #{Hardware::CPU.arch_32_bit}"
     else
-      ENV['ARCHFLAGS'] = "-arch i386 -arch x86_64"
+      ENV['ARCHFLAGS'] = Hardware::CPU.universal_archs.as_arch_flags
     end
 
     # Prep work for svn compile.