From 723f7ed11194e9fc5ef2831548b4a6a1389ef89d Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Thu, 13 Jun 2013 18:41:14 -0500
Subject: Simplify nested conditional

---
 Library/Homebrew/extend/ENV.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index f69467bae..591c0485e 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -298,9 +298,9 @@ module HomebrewEnvExtension
     replace_in_cflags '-O4', '-O3' # O4 seems to cause the build to fail
     append 'LDFLAGS', '-arch i386 -arch x86_64'
 
-    unless compiler == :clang
+    if compiler != :clang && Hardware.is_32_bit?
       # Can't mix "-march" for a 32-bit CPU  with "-arch x86_64"
-      replace_in_cflags(/-march=\S*/, '-Xarch_i386 \0') if Hardware::CPU.is_32_bit?
+      replace_in_cflags(/-march=\S*/, '-Xarch_i386 \0')
     end
   end
 
-- 
cgit v1.2.3