diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-04-28 14:07:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 14:07:05 +0200 |
| commit | 4bab3a578ecf28510f5891531ef538c95fc46346 (patch) | |
| tree | e84842c6a78f3bd1b54679a48d8c24eff8e82722 /default_build_settings.cmake | |
| parent | b87d1ff7ffd689d7ab2db04712b90864770c7147 (diff) | |
| parent | 8f746458231dd59fb77993258d4bde156f8a1c22 (diff) | |
Merge pull request #17633 from vespa-engine/toregge/avoid-tuning-for-wrong-cpu
Avoid tuning compiler for wrong cpu.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 4bd2509d8f7..167a027975e 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -218,10 +218,12 @@ function(vespa_use_default_build_settings) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${DEFAULT_CMAKE_SHARED_LINKER_FLAGS}" PARENT_SCOPE) endif() if(NOT DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS) - if(VESPA_OS_DISTRO STREQUAL "fedora" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere -mtune=haswell") - else() - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-mtune=intel") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + if(VESPA_OS_DISTRO STREQUAL "fedora" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere -mtune=haswell") + else() + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-mtune=intel") + endif() endif() endif() if(DEFINED DEFAULT_CMAKE_PREFIX_PATH) |