diff options
| author | Jack Nagel | 2014-05-09 20:49:36 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-09 20:49:36 -0500 |
| commit | ed32759f858f5f61a2c99737b214c8689d055fdd (patch) | |
| tree | 6aa24f0db502f6b48ac52d159b5410aa2bce63fe /Library | |
| parent | 6730e873fa5928585ad4e7e63e2b242e7e68bcb9 (diff) | |
| download | homebrew-ed32759f858f5f61a2c99737b214c8689d055fdd.tar.bz2 | |
mysql-cluster: build universal under superenv
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/mysql-cluster.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Formula/mysql-cluster.rb b/Library/Formula/mysql-cluster.rb index 749f396bd..59d350e1f 100644 --- a/Library/Formula/mysql-cluster.rb +++ b/Library/Formula/mysql-cluster.rb @@ -21,8 +21,6 @@ class MysqlCluster < Formula conflicts_with 'mysql', 'mariadb', 'percona-server', :because => "mysql, mariadb, and percona install the same binaries." - env :std if build.universal? - fails_with :clang do build 500 cause "http://article.gmane.org/gmane.comp.db.mysql.cluster/2085" @@ -69,7 +67,10 @@ class MysqlCluster < Formula args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.with? "blackhole-storage-engine" # 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' |