Problems with homebrew universal binary formulas on Lion

disabling-universal.diff

diff --git a/Library/Formula/gnutls.rb b/Library/Formula/gnutls.rb
index 9f9b9ef..68a7716 100644
--- a/Library/Formula/gnutls.rb
+++ b/Library/Formula/gnutls.rb
@@ -16,7 +16,7 @@ class Gnutls < Formula
   fails_with_llvm "Undefined symbols when linking", :build => "2326"
 
   def install
-    ENV.universal_binary	# build fat so wine can use it
+    # ENV.universal_binary  # build fat so wine can use it
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--disable-guile",
diff --git a/Library/Formula/libgcrypt.rb b/Library/Formula/libgcrypt.rb
index 8203197..a0e362a 100644
--- a/Library/Formula/libgcrypt.rb
+++ b/Library/Formula/libgcrypt.rb
@@ -8,7 +8,7 @@ class Libgcrypt < Formula
   depends_on 'libgpg-error'
 
   def install
-    ENV.universal_binary	# build fat so wine can use it
+    # ENV.universal_binary  # build fat so wine can use it
 
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/libgpg-error.rb b/Library/Formula/libgpg-error.rb
index e515e27..7183a62 100644
--- a/Library/Formula/libgpg-error.rb
+++ b/Library/Formula/libgpg-error.rb
@@ -7,7 +7,7 @@ class LibgpgError < Formula
 
   def install
     ENV.j1
-    ENV.universal_binary  # build fat so wine can use it
+    # ENV.universal_binary  # build fat so wine can use it
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"

install-log.sh

$ brew install -f libgcrypt
==> Downloading ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2
File already downloaded in /Users/irae/Library/Caches/Homebrew
==> ./configure --prefix=/usr/local/Cellar/libgcrypt/1.5.0 --disable-asm --with-gpg-error-prefix=/usr/local
==> make
make  all-recursive
Making all in compat
/bin/sh ../libtool --tag=CC   --mode=compile /usr/bin/cc -DHAVE_CONFIG_H -I. -I..  -I../src -I../src -I/usr/local/Cellar/libgpg-error/1.10/include   -O3 -march=core2 -msse4 -w -pipe -arch i386 -arch x86_64 -Wall -MT compat.lo -MD -MP -MF .deps/compat.Tpo -c -o compat.lo compat.c
libtool: compile:  /usr/bin/cc -DHAVE_CONFIG_H -I. -I.. -I../src -I../src -I/usr/local/Cellar/libgpg-error/1.10/include -O3 -march=core2 -msse4 -w -pipe -arch i386 -arch x86_64 -Wall -MT compat.lo -MD -MP -MF .deps/compat.Tpo -c compat.c  -fno-common -DPIC -o .libs/compat.o
llvm-gcc-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
make[2]: *** [compat.lo] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2
==> Exit Status: 2
http://github.com/mxcl/homebrew/blob/master/Library/Formula/libgcrypt.rb#L18
==> Environment
HOMEBREW_VERSION: 0.8
HEAD: 98d16613a8b6e85d1a33fff1839e13f7bab2f103
HOMEBREW_PREFIX: /usr/local
HOMEBREW_CELLAR: /usr/local/Cellar
HOMEBREW_REPOSITORY: /usr/local
HOMEBREW_LIBRARY_PATH: /usr/local/Library/Homebrew
Hardware: quad-core 64-bit nehalem
OS X: 10.7
Kernel Architecture: x86_64
Ruby: 1.8.7-249
/usr/bin/ruby => /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
Xcode: 4.2
GCC-4.0: N/A 
GCC-4.2: build 5666 
LLVM: build 2335 
MacPorts or Fink? false
X11 installed? true
==> Build Flags
CC: /usr/bin/cc => /usr/llvm-gcc-4.2/bin/llvm-gcc-4.2
CXX: /usr/bin/c++ => /usr/llvm-gcc-4.2/bin/llvm-g++-4.2
LD: /usr/bin/cc => /usr/llvm-gcc-4.2/bin/llvm-gcc-4.2
CFLAGS: -O3 -march=core2 -msse4 -w -pipe -arch i386 -arch x86_64
CXXFLAGS: -O3 -march=core2 -msse4 -w -pipe -arch i386 -arch x86_64
LDFLAGS: -arch i386 -arch x86_64
MAKEFLAGS: -j4

Error: Failed executing: make