diff options
| author | Henning Baldersheim <balder@verizonmedia.com> | 2020-04-21 07:36:23 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@verizonmedia.com> | 2020-04-21 07:36:23 +0000 |
| commit | 0b37ff6b24dc51e5100ca1843b104f71d5363341 (patch) | |
| tree | 7ff1c2186c13b9ac79b7255f345f92254a31a96a /default_build_settings.cmake | |
| parent | a67730504d6115786748bbe2a500967a5e40d6aa (diff) | |
Rhel 6 needs -rt to gte clock_gettime.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 6ed2e06e060..597eb69d70b 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -5,6 +5,7 @@ include(VespaExtendedDefaultBuildSettings OPTIONAL) function(setup_vespa_default_build_settings_rhel_6_10) message("-- Setting up default build settings for rhel 6.10") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_CMAKE_SHARED_LINKER_FLAGS "-lrt" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_rhel_7_7) @@ -137,6 +138,7 @@ function(vespa_use_default_build_settings) unset(DEFAULT_EXTRA_LINK_DIRECTORY) unset(DEFAULT_EXTRA_INCLUDE_DIRECTORY) unset(DEFAULT_VESPA_CPU_ARCH_FLAGS) + unset(DEFAULT_CMAKE_SHARED_LINKER_FLAGS) if(APPLE) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(VESPA_DEPS "/opt/vespa-deps-clang") @@ -190,6 +192,10 @@ function(vespa_use_default_build_settings) if(NOT DEFINED DEFAULT_EXTRA_INCLUDE_DIRECTORY) set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include") endif() + if(DEFINED DEFAULT_CMAKE_SHARED_LINKER_FLAGS) + message("-- DEFAULT_CMAKE_SHARED_LINKER_FLAGS is ${DEFAULT_CMAKE_SHARED_LINKER_FLAGS}") + 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") |