From 00220c40dbed783be83a661ae3d56d52aa53f9c0 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 18 Aug 2014 16:02:12 -0500 Subject: [PATCH] Don't overwrite optimization flag map in ENV.clang --- Library/Homebrew/extend/ENV/std.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index b6ca357b06..58c021bd65 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -133,7 +133,9 @@ module Stdenv super replace_in_cflags(/-Xarch_#{Hardware::CPU.arch_32_bit} (-march=\S*)/, '\1') # Clang mistakenly enables AES-NI on plain Nehalem - set_cpu_cflags '-march=native', :nehalem => '-march=native -Xclang -target-feature -Xclang -aes' + map = Hardware::CPU.optimization_flags + map = map.merge(:nehalem => "-march=native -Xclang -target-feature -Xclang -aes") + set_cpu_cflags "-march=native", map end def remove_macosxsdk version=MacOS.version