diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-16 10:00:58 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-16 10:00:58 +0000 |
| commit | e505e01d3c0fa776a2667faae4dbbb8f105167a9 (patch) | |
| tree | 2c13f68d64d77470882e3e157adc620a07bb4e00 /build_settings.cmake | |
| parent | e2fa647910b94521466f96cd25ac0e8b6542e7f8 (diff) | |
Default is to use atomic library explicit.
Diffstat (limited to 'build_settings.cmake')
| -rw-r--r-- | build_settings.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index a0b9ce5160a..b1bd089deea 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -35,6 +35,7 @@ endif() # Warnings that are specific to C++ compilation # Note: this is not a union of C_WARN_OPTS, since CMAKE_CXX_FLAGS already includes CMAKE_C_FLAGS, which in turn includes C_WARN_OPTS transitively +set(VESPA_ATOMIC_LIB "atomic") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") set(CXX_SPECIFIC_WARN_OPTS "-Wnon-virtual-dtor -Wformat-security -Wno-overloaded-virtual") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks -fsized-deallocation") @@ -43,7 +44,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST set(VESPA_GCC_LIB "") set(VESPA_STDCXX_FS_LIB "") else() - set(VESPA_ATOMIC_LIB "atomic") if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) set(VESPA_GCC_LIB "gcc") set(VESPA_STDCXX_FS_LIB "stdc++fs") @@ -54,16 +54,15 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST endif() else() set(CXX_SPECIFIC_WARN_OPTS "-Wnoexcept -Wsuggest-override -Wnon-virtual-dtor -Wformat-security") - if(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8" OR + if((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") AND + (VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8" OR (VESPA_OS_DISTRO STREQUAL "rocky" AND VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND VESPA_OS_DISTRO_VERSION VERSION_LESS "9") OR (VESPA_OS_DISTRO STREQUAL "rhel" AND VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND - VESPA_OS_DISTRO_VERSION VERSION_LESS "9")) - set(VESPA_ATOMIC_LIB "") - else() - set(VESPA_ATOMIC_LIB "atomic") + VESPA_OS_DISTRO_VERSION VERSION_LESS "9"))) + set(VESPA_ATOMIC_LIB "") endif() set(VESPA_GCC_LIB "gcc") set(VESPA_STDCXX_FS_LIB "stdc++fs") |