diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-09-06 11:17:43 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-09-06 11:17:43 +0200 |
| commit | f4f98a4943260db57e7c7d875fc91f3b2102043c (patch) | |
| tree | 634fa865f4a5c7a1def53b458de3d753e123f102 /default_build_settings.cmake | |
| parent | f4e9ed2a5cfec33c0ff3e014490b013b144036fd (diff) | |
Remove build settings for CentOS 7 and Amazon Linux 2.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index e973cfcf7f7..50d262143b6 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -21,21 +21,10 @@ function(setup_vespa_default_build_settings_rhel_8) set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_centos_7) - message("-- Setting up default build settings for centos 7") - set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE) - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE) -endfunction() - -function(setup_vespa_default_build_settings_centos_8) - message("-- Setting up default build settings for centos 8") +function(setup_vespa_default_build_settings_centos_stream_8) + message("-- Setting up default build settings for centos stream 8") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) - if (VESPA_OS_DISTRO_NAME STREQUAL "CentOS Stream") - set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) - else() - set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) - endif() + set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_centos_stream_9) @@ -98,13 +87,6 @@ function(setup_vespa_default_build_settings_fedora_38) set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_amzn_2) - message("-- Setting up default build settings for amzn 2") - set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE) - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE) -endfunction() - function(setup_vespa_default_build_settings_amzn_2022) message("-- Setting up default build settings for amzn 2022") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) @@ -222,10 +204,8 @@ function(vespa_use_default_build_settings) VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND VESPA_OS_DISTRO_VERSION VERSION_LESS "9") setup_vespa_default_build_settings_rhel_8() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 7") - setup_vespa_default_build_settings_centos_7() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8") - setup_vespa_default_build_settings_centos_8() + setup_vespa_default_build_settings_centos_stream_8() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 9") setup_vespa_default_build_settings_centos_stream_9() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rocky 8.6") @@ -244,8 +224,6 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_fedora_37() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 38") setup_vespa_default_build_settings_fedora_38() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") - setup_vespa_default_build_settings_amzn_2() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2022") setup_vespa_default_build_settings_amzn_2022() elseif(VESPA_OS_DISTRO STREQUAL "ubuntu") |