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 cc51bbde852..5ba7494d1e1 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -31,7 +31,7 @@ endfunction() function(setup_vespa_default_build_settings_centos_8) message("-- Setting up default build settings for centos 8") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "8" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "9" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_darwin) diff --git a/dist/vespa.spec b/dist/vespa.spec index aeee3a2dbd8..1e1658d3d55 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -62,11 +62,7 @@ BuildRequires: vespa-icu-devel >= 65.1.0-1 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 -%if 0%{?centos} -BuildRequires: llvm-devel >= 8.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 @@ -169,13 +165,8 @@ Requires: vespa-valgrind >= 3.16.0-1 %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 >= 8.0.1 -%define _vespa_llvm_version 8 -%else Requires: llvm-libs >= 9.0.1 %define _vespa_llvm_version 9 -%endif Requires: vespa-protobuf >= 3.7.0-4 Requires: openssl-libs %define _extra_link_directory %{_vespa_deps_prefix}/lib64 |