diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-01-13 12:50:32 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-01-13 12:50:32 +0100 |
commit | 5819615ab7728f80bb4feddd23ce1b53e40120b8 (patch) | |
tree | bc69e7e4d8f8048d386258bfad753b7a29e29430 | |
parent | 888ca63a201a8d2e471a201eea127dc319a3fc8b (diff) |
Use llvm 12 on RHEL 8.
-rw-r--r-- | default_build_settings.cmake | 2 | ||||
-rw-r--r-- | dist/vespa.spec | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 0bada8160be..01ca3590b0f 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -18,7 +18,7 @@ endfunction() function(setup_vespa_default_build_settings_rhel_8) message("-- Setting up default build settings for rhel 8") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_centos_7) diff --git a/dist/vespa.spec b/dist/vespa.spec index 724cffcc7f1..ab7bb6acb2d 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -124,7 +124,7 @@ BuildRequires: (llvm-devel >= 13.0.0 and llvm-devel < 14) BuildRequires: (llvm-devel >= 12.0.0 and llvm-devel < 13) %endif %else -BuildRequires: (llvm-devel >= 10.0.1 and llvm-devel < 11) +BuildRequires: (llvm-devel >= 12.0.1 and llvm-devel < 13) %endif BuildRequires: vespa-boost-devel >= 1.76.0-1 BuildRequires: vespa-openssl-devel >= 1.1.1l-1 @@ -302,7 +302,7 @@ Requires: vespa-gtest = 1.11.0 %define _vespa_llvm_version 12 %endif %else -%define _vespa_llvm_version 10 +%define _vespa_llvm_version 12 %endif Requires: vespa-gtest = 1.11.0 %define _extra_link_directory %{_vespa_deps_prefix}/lib64 @@ -432,7 +432,7 @@ Requires: (llvm-libs >= 13.0.0 and llvm-libs < 14) Requires: (llvm-libs >= 12.0.0 and llvm-libs < 13) %endif %else -Requires: (llvm-libs >= 10.0.1 and llvm-libs < 11) +Requires: (llvm-libs >= 12.0.1 and llvm-libs < 13) %endif Requires: vespa-protobuf = 3.19.1 %endif |