Add default build settings for AlmaLinux 8.5 and RockyLinux 8.5.
@@ -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")
