diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-08 05:06:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 05:06:09 +0100 |
| commit | 551f42c6a5e9eaf1450875e633eeb67624e43345 (patch) | |
| tree | 7420d87f005d41073bc6e4c225ead9ac8b31ab02 /default_build_settings.cmake | |
| parent | f61879ce17acadb8d9fb955e76fe848c13e0a345 (diff) | |
| parent | bc5161e85a44e88594a53fb6b77a47c27f25a2a5 (diff) | |
Merge pull request #20409 from vespa-engine/toregge/add-almalinux-8-5
Add default build settings for AlmaLinux 8.5 and RockyLinux 8.5.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index b0dfed2bfd5..7413e41d00f 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -38,10 +38,16 @@ function(setup_vespa_default_build_settings_centos_8) endif() endfunction() -function(setup_vespa_default_build_settings_rocky_8_4) - message("-- Setting up default build settings for rocky 8.4") +function(setup_vespa_default_build_settings_rocky_8_5) + message("-- Setting up default build settings for rocky 8.5") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) +endfunction() + +function(setup_vespa_default_build_settings_almalinux_8_5) + message("-- Setting up default build settings for almalinux 8.5") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_darwin) @@ -192,8 +198,10 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_centos_7() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8") setup_vespa_default_build_settings_centos_8() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rocky 8.4") - setup_vespa_default_build_settings_rocky_8_4() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rocky 8.5") + setup_vespa_default_build_settings_rocky_8_5() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "almalinux 8.5") + setup_vespa_default_build_settings_almalinux_8_5() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 32") |