Merge pull request #7334 from Bo98/std-nehalem

ENV/std: conditionally apply AES-NI workaround
Homebrew · Apr 13, 2020 · c5c161a · c5c161a
2 parents 9b8762f + df47668
commit c5c161a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
@@ -112,9 +112,11 @@ def determine_cxx
   def clang
     super
     replace_in_cflags(/-Xarch_#{Hardware::CPU.arch_32_bit} (-march=\S*)/, '\1')
-    # Clang mistakenly enables AES-NI on plain Nehalem
     map = Hardware::CPU.optimization_flags
-                       .merge(nehalem: "-march=nehalem -Xclang -target-feature -Xclang -aes")
+    if DevelopmentTools.clang_build_version < 700
+      # Clang mistakenly enables AES-NI on plain Nehalem
+      map[:nehalem] = "-march=nehalem -Xclang -target-feature -Xclang -aes"
+    end
     set_cpu_cflags map
   end