diff options
| author | Tor Egge <Tor.Egge@online.no> | 2024-01-15 11:13:10 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2024-01-15 11:13:10 +0100 |
| commit | c4a8401b87433c474e8f6ed5c70812776e610ed3 (patch) | |
| tree | fd368a4d71b9c22ea21d734d7342f95ed6b0026b /default_build_settings.cmake | |
| parent | e5c92075e6f0e9caaa6c81254be889c3dba77634 (diff) | |
Restore workaround for gcc 12.2 compiler bug (on Debian 12).
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 580124993e6..3bf7ed16b66 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -131,8 +131,13 @@ function(vespa_use_default_build_settings) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if(APPLE AND (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang"))) elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - # Default to haswell cpu or newer - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake-avx512") + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0 AND NOT CMAKE_CXX_COMPILE_VERSION VERSION_GREATER_EQUAL 12.3) + # Temporary workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake") + else() + # Default to haswell cpu or newer + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake-avx512") + endif() endif() elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=armv8.2-a+fp16+dotprod+crypto -mtune=neoverse-n1") |