percona-server: build universal under superenv

Formula/percona-server.rb

@@ -29,8 +29,6 @@ class PerconaServer < Formula
   conflicts_with 'mysql-connector-c',
     :because => 'both install MySQL client libraries'
 
-  env :std if build.universal?
-
   fails_with :llvm do
     build 2334
     cause "https://github.com/Homebrew/homebrew/issues/issue/144"
@@ -98,7 +96,10 @@ class PerconaServer < Formula
     args << "-DWITH_INNODB_MEMCACHED=ON" if build.with? 'memcached'
 
     # Make universal for binding to universal applications
-    args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?
+    if build.universal?
+      ENV.universal_binary
+      args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.universal_archs.as_cmake_arch_flags}"
+    end
 
     # Build with local infile loading support
     args << "-DENABLED_LOCAL_INFILE=1" if build.include? 'enable-local-infile'