Merge pull request #7483 from Bo98/std-cpu-flags

ENV/std: fix error when using older/no clang
This commit is contained in:
Mike McQuaid 2020-05-02 14:16:26 +01:00 committed by GitHub
commit 4019f62e61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -112,7 +112,7 @@ module Stdenv
def clang def clang
super super
replace_in_cflags(/-Xarch_#{Hardware::CPU.arch_32_bit} (-march=\S*)/, '\1') replace_in_cflags(/-Xarch_#{Hardware::CPU.arch_32_bit} (-march=\S*)/, '\1')
map = Hardware::CPU.optimization_flags map = Hardware::CPU.optimization_flags.dup
if DevelopmentTools.clang_build_version < 700 if DevelopmentTools.clang_build_version < 700
# Clang mistakenly enables AES-NI on plain Nehalem # Clang mistakenly enables AES-NI on plain Nehalem
map[:nehalem] = "-march=nehalem -Xclang -target-feature -Xclang -aes" map[:nehalem] = "-march=nehalem -Xclang -target-feature -Xclang -aes"