diff options
| author | Tor Egge <Tor.Egge@online.no> | 2024-04-10 17:09:57 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2024-04-10 17:09:57 +0200 |
| commit | 77b1e064d71c4120778548133c4839263ffed1c4 (patch) | |
| tree | f03573dea4ff8ad6112cf0f5da53b7481f5642a8 | |
| parent | 8234c739eb82321b0a7aaa301f34af620e7c9f1d (diff) | |
Remove settings for Debian 10 and Amazon Linux 2 from cmake setup.
| -rw-r--r-- | build_settings.cmake | 8 | ||||
| -rw-r--r-- | default_build_settings.cmake | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 3477531cb56..1549ac83c74 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -90,12 +90,6 @@ else() message("-- liburing not found") endif() -if(VESPA_OS_DISTRO_COMBINED STREQUAL "debian 10") - unset(VESPA_XXHASH_DEFINE) -else() - set(VESPA_XXHASH_DEFINE "-DXXH_INLINE_ALL") -endif() - # Disable dangling reference and overloaded virtual warnings when using gcc 13 # Disable stringop-oveflow, stringop-overread and array-bounds warning when using gcc 13. # The latter heuristics are sufficiently broken to be useless in practice. @@ -111,7 +105,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND VESPA_USE_LTO) endif() # C and C++ compiler flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} ${VESPA_XXHASH_DEFINE} -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} ${EXTRA_C_FLAGS}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DXXH_INLINE_ALL -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} ${EXTRA_C_FLAGS}") # AddressSanitizer/ThreadSanitizer work for both GCC and Clang if (VESPA_USE_SANITIZER) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${VESPA_USE_SANITIZER}") diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 63ac2c306cb..3a06a33ab44 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -205,9 +205,6 @@ function(vespa_use_default_cxx_compiler) if(APPLE) set(DEFAULT_CMAKE_C_COMPILER "${VESPA_HOMEBREW_PREFIX}/bin/gcc-13") set(DEFAULT_CMAKE_CXX_COMPILER "${VESPA_HOMEBREW_PREFIX}/bin/g++-13") - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") - set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/gcc10-gcc") - set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/gcc10-g++") elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 22.04" AND EXISTS "/usr/bin/gcc-12" AND EXISTS "/usr/bin/g++-12") set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/gcc-12") |