From df47668113e5c4c10230965f654b8ee0de5db908 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sun, 12 Apr 2020 14:50:49 +0100 Subject: [PATCH] ENV/std: conditionally apply AES-NI workaround --- Library/Homebrew/extend/ENV/std.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 26e6582098..0e0ba9846d 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -112,9 +112,11 @@ module Stdenv 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