1 files changed, 16 insertions, 2 deletions
diff --git a/Library/Formula/libyaml.rb b/Library/Formula/libyaml.rb
index 4dda35bc8..a999cace6 100644
--- a/Library/Formula/libyaml.rb
+++ b/Library/Formula/libyaml.rb
@@ -5,8 +5,22 @@ class Libyaml < Formula
   homepage 'http://pyyaml.org/wiki/LibYAML'
   md5 '36c852831d02cf90508c29852361d01b'
 
+  def options
+    [
+      ["--universal", "Build for both 32 & 64 bit Intel."],
+    ]
+  end
+
   def install
-    system "./configure", "--prefix=#{prefix}"
+    args = ["--prefix=#{prefix}"]
+
+    if ARGV.build_universal?
+      ENV['CFLAGS'] = "-arch i386 -arch x86_64"
+      ENV['LDFLAGS'] = "-arch i386 -arch x86_64"
+      args << "--disable-dependency-tracking"
+    end
+
+    system './configure', *args
     system "make install"
   end
-end
+end
+\ No newline at end of file