From 1b727835de9f6efc6a98939873a8255617902fbc Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Thu, 13 Sep 2012 08:53:35 -0400
Subject: [PATCH] Fixes universal builds; Fixes #14845

---
 Library/ENV/4.3/cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index 18ab4aca2c88..158c187bb67d 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -120,12 +120,12 @@ class Cmd
     if cccfg? 'Ob'
       %w{-mtune=generic -Oz}
     elsif cccfg? 'O'
-      u = '-arch i386 -arch x86_64' if cccfg? 'u'
-      c = case tool when 'clang', 'clang++' then '-march=native' end
+      u = %w{-arch i386 -arch x86_64} if cccfg? 'u'
+      c = '-march=native' if tool =~ /clang/
       %w{-pipe -w -Os} << u << c
     else
       []
-    end
+    end.flatten
   end
   def syslibpath
     # We reject brew's lib as we explicitly add this as a -L flag, thus it