diff options
| author | Tor Egge <tegge@vespa.ai> | 2024-01-15 12:47:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 12:47:24 +0100 |
| commit | 716b48d81d3ada898fda8e7e2597ae07fb1b9290 (patch) | |
| tree | 18409c3b0f6be5f7c0126f6018b25c38e1809259 | |
| parent | e9dda52b68c0ebd463c09df786b2e00fd337d06b (diff) | |
| parent | fa306e4fc3cfb2dcce0496d4b8bc883d05ff14f8 (diff) | |
Merge pull request #29900 from vespa-engine/toregge/gcc-12-2-is-still-broken
Restore workaround for gcc 12.2 compiler bug (on Debian 12).
| -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..41ab347f8a0 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_COMPILER_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") |