From a07c19ca96ed69a894bc972e4a35969ddf65384c Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 5 Oct 2014 13:27:38 -0500
Subject: ruby: fix universal build

---
 Library/Formula/ruby.rb | 9 +++++++--
 1 file 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?
-- 
cgit v1.2.3