From ce6b627f9ca31e5edcd9fa3dc251ba05ff82bb1c Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Wed, 20 Nov 2013 09:58:40 -0600
Subject: Revert "wine: enable superenv"

The non-universal freetype workaround was broken by the switch to
superenv, which re-orders library paths, so revert this change
temporarily.

Fixes #24525.

This reverts commit 9edbfaa6b7cf0053b04b44da693b4bc84a097e30.
---
 Library/Formula/wine.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index b88569a12..f7c69f129 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -30,6 +30,8 @@ class Wine < Formula
     depends_on 'little-cms2'
   end
 
+  env :std
+
   # note that all wine dependencies should declare a --universal option in their formula,
   # otherwise homebrew will not notice that they are not built universal
   require_universal_deps
@@ -90,7 +92,11 @@ class Wine < Formula
   end
 
   def install
-    ENV.m32 # Build 32-bit; Wine doesn't support 64-bit host builds on OS X.
+    # Build 32-bit; Wine doesn't support 64-bit host builds on OS X.
+    build32 = "-arch i386 -m32"
+
+    ENV.append "CFLAGS", build32
+    ENV.append "LDFLAGS", build32
 
     # The clang that comes with Xcode 5 no longer miscompiles wine. Tested with 1.7.3.
     if ENV.compiler == :clang and MacOS.clang_build_version < 500
-- 
cgit v1.2.3