diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2021-03-06 14:37:26 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2021-03-06 14:37:26 +0100 |
| commit | d755ffa5f860f3536250bb2d1177eaad907af237 (patch) | |
| tree | f4c35996eaf7e0600a416477f1040b9f8f1006a6 | |
| parent | 1e0331fad1ca9237f31564d5e716354cf676f70a (diff) | |
Use llvm 12 on Fedora 34 and Fedora rawhide.
| -rw-r--r-- | default_build_settings.cmake | 4 | ||||
| -rw-r--r-- | dist/vespa.spec | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index c88d82db59a..919bc0222cd 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -72,13 +72,13 @@ endfunction() function(setup_vespa_default_build_settings_fedora_34) message("-- Setting up default build settings for fedora 34") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_fedora_35) message("-- Setting up default build settings for fedora 35") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_ubuntu) diff --git a/dist/vespa.spec b/dist/vespa.spec index 795d666bb76..0548ced1014 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -96,14 +96,14 @@ BuildRequires: gmock-devel %endif %if 0%{?fc34} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 11.1.0 +BuildRequires: llvm-devel >= 12.0.0 BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %if 0%{?fc35} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 11.1.0 +BuildRequires: llvm-devel >= 12.0.0 BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -208,13 +208,13 @@ Requires: llvm-libs >= 11.0.0 %endif %if 0%{?fc34} Requires: protobuf -Requires: llvm-libs >= 11.1.0 -%define _vespa_llvm_version 11 +Requires: llvm-libs >= 12.0.0 +%define _vespa_llvm_version 12 %endif %if 0%{?fc35} Requires: protobuf -Requires: llvm-libs >= 11.1.0 -%define _vespa_llvm_version 11 +Requires: llvm-libs >= 12.0.0 +%define _vespa_llvm_version 12 %endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas |