Don't overwrite optimization flag map in ENV.clang

2014-08-18 16:02:12 -05:00 · 2014-08-18 16:02:12 -05:00 · 00220c40db
commit 00220c40db
parent b5aed44825
1 changed files with 3 additions and 1 deletions
--- 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