diff options
| -rw-r--r-- | default_build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 9a780e77e69..07191d6781e 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" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "9" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_centos_7) diff --git a/dist/vespa.spec b/dist/vespa.spec index e897a03e58a..50d591bde5c 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -64,11 +64,7 @@ BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 -%if 0%{?centos} BuildRequires: llvm-devel >= 10.0.1 -%else -BuildRequires: llvm-devel >= 9.0.1 -%endif BuildRequires: boost-devel >= 1.66 BuildRequires: openssl-devel BuildRequires: vespa-gtest >= 1.8.1-1 @@ -177,13 +173,8 @@ Requires: vespa-zstd >= 1.4.5-2 %define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include;/usr/include/openblas %endif %if 0%{?el8} -%if 0%{?centos} Requires: llvm-libs >= 10.0.1 %define _vespa_llvm_version 10 -%else -Requires: llvm-libs >= 9.0.1 -%define _vespa_llvm_version 9 -%endif Requires: openssl-libs Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime = 1.4.0 |