aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-08-18 16:02:12 -0500
committerJack Nagel2014-08-18 16:02:53 -0500
commit74890437cb8a62174413dedc4eecd31bd8aeddfc (patch)
treeaa249c82e3e6f12bae81dd444d1d7ff1bee4e770
parentd164ccd3941b200ece01a43b848a382977b621a9 (diff)
downloadhomebrew-74890437cb8a62174413dedc4eecd31bd8aeddfc.tar.bz2
Don't overwrite optimization flag map in ENV.clang
-rw-r--r--Library/Homebrew/extend/ENV/std.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index b6ca357b0..58c021bd6 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