summaryrefslogtreecommitdiffstats
path: root/default_build_settings.cmake
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2022-05-18 10:38:19 +0200
committerTor Egge <Tor.Egge@online.no>2022-05-18 10:38:19 +0200
commit0ee39ad48bbdad3d7a3781a7a969cfb966a48ab0 (patch)
treea65b787c2a73c4a45c229e8e507d9bb510d2f079 /default_build_settings.cmake
parentb116016d101c88f0649c026af382a1f735e80f50 (diff)
Rocky Linux 8.6 uses llvm 13.
Diffstat (limited to 'default_build_settings.cmake')
-rw-r--r--default_build_settings.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake
index daa8d4b990b..0b8cf873a27 100644
--- a/default_build_settings.cmake
+++ b/default_build_settings.cmake
@@ -44,10 +44,10 @@ function(setup_vespa_default_build_settings_centos_stream_9)
set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE)
endfunction()
-function(setup_vespa_default_build_settings_rocky_8_5)
- message("-- Setting up default build settings for rocky 8.5")
+function(setup_vespa_default_build_settings_rocky_8_6)
+ message("-- Setting up default build settings for rocky 8.6")
set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE)
- set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE)
+ set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE)
endfunction()
function(setup_vespa_default_build_settings_almalinux_8_6)
@@ -206,8 +206,8 @@ function(vespa_use_default_build_settings)
setup_vespa_default_build_settings_centos_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.5")
- setup_vespa_default_build_settings_rocky_8_5()
+ elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rocky 8.6")
+ setup_vespa_default_build_settings_rocky_8_6()
elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "almalinux 8.6")
setup_vespa_default_build_settings_almalinux_8_6()
elseif(VESPA_OS_DISTRO STREQUAL "darwin")