aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-10-05 13:27:38 -0500
committerJack Nagel2014-10-05 13:27:38 -0500
commita07c19ca96ed69a894bc972e4a35969ddf65384c (patch)
treeae38ca7c3c076275302f5e841323519d852c326c
parent0d67a9dd35c75640bcf0643f47d928e7d10c5836 (diff)
downloadhomebrew-a07c19ca96ed69a894bc972e4a35969ddf65384c.tar.bz2
ruby: fix universal build
-rw-r--r--Library/Formula/ruby.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index 6dcb050b4..b3321d11c 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -41,9 +41,14 @@ class Ruby < Formula
--prefix=#{prefix} --enable-shared --disable-silent-rules
--with-sitedir=#{HOMEBREW_PREFIX}/lib/ruby/site_ruby
--with-vendordir=#{HOMEBREW_PREFIX}/lib/ruby/vendor_ruby
- ]
+ ]
+
+ if build.universal?
+ ENV.universal_binary
+ args << "--with-arch=#{Hardware::CPU.universal_archs.join(",")}"
+ end
+
args << "--program-suffix=21" if build.with? "suffix"
- args << "--with-arch=#{Hardware::CPU.universal_archs.join(',')}" if build.universal?
args << "--with-out-ext=tk" if build.without? "tcltk"
args << "--disable-install-doc" if build.without? "doc"
args << "--disable-dtrace" unless MacOS::CLT.installed?