diff options
-rw-r--r-- | default_build_settings.cmake | 12 | ||||
-rw-r--r-- | dist/vespa.spec | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 622755495c2..cdc1f8e0848 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -9,9 +9,9 @@ endfunction() function(setup_vespa_default_build_settings_rhel_7_7) message("-- Setting up default build settings for rhel 7.7") - set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm5.0/lib" PARENT_SCOPE) - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm5.0" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "5.0" PARENT_SCOPE) + set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE) + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "7.0" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_rhel_8_1) @@ -21,9 +21,9 @@ endfunction() function(setup_vespa_default_build_settings_centos_7) message("-- Setting up default build settings for centos 7") - set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm5.0/lib" PARENT_SCOPE) - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm5.0" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "5.0" PARENT_SCOPE) + set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE) + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_centos_8) diff --git a/dist/vespa.spec b/dist/vespa.spec index 16222ed3852..7526cd36309 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -49,7 +49,7 @@ BuildRequires: libatomic BuildRequires: Judy-devel %if 0%{?el7} BuildRequires: cmake3 -BuildRequires: llvm5.0-devel +BuildRequires: llvm7.0-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 BuildRequires: vespa-gtest >= 1.8.1-1 BuildRequires: vespa-protobuf-devel >= 3.7.0-4 @@ -154,14 +154,14 @@ Requires: perf Requires: gdb Requires: net-tools %if 0%{?el7} -Requires: llvm5.0 +Requires: llvm7.0 Requires: vespa-openssl >= 1.1.1c-1 Requires: vespa-icu >= 65.1.0-1 Requires: vespa-protobuf >= 3.7.0-4 Requires: vespa-telegraf >= 1.1.1-1 -%define _vespa_llvm_version 5.0 -%define _extra_link_directory /usr/lib64/llvm5.0/lib;%{_vespa_deps_prefix}/lib64 -%define _extra_include_directory /usr/include/llvm5.0;%{_vespa_deps_prefix}/include;/usr/include/openblas +%define _vespa_llvm_version 7.0 +%define _extra_link_directory /usr/lib64/llvm7.0/lib;%{_vespa_deps_prefix}/lib64 +%define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include;/usr/include/openblas %endif %if 0%{?el8} Requires: llvm-libs >= 8.0.1 |