diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-04-23 17:35:56 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-04-23 17:35:56 +0200 |
| commit | 2fd1e827bd77e1b6cfb600fd355c96cc781d48c2 (patch) | |
| tree | 9cb1920c9ea75587aa24fc98330ea3ef09652db1 | |
| parent | 42dfc8a672fa4e088246fd8d7430a61b724bcbdf (diff) | |
Fedora 36 has llvm 14.
| -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 1925e5f42b6..6f711a72353 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -83,13 +83,13 @@ endfunction() function(setup_vespa_default_build_settings_fedora_36) message("-- Setting up default build settings for fedora 36") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_fedora_37) message("-- Setting up default build settings for fedora 37") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_amzn_2) diff --git a/dist/vespa.spec b/dist/vespa.spec index 7e7a3e6ab58..0154467f90e 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -177,14 +177,14 @@ BuildRequires: gmock-devel %endif %if 0%{?fc36} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 13.0.1 +BuildRequires: llvm-devel >= 14.0.0 BuildRequires: boost-devel >= 1.76 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %if 0%{?fc37} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 13.0.1 +BuildRequires: llvm-devel >= 14.0.0 BuildRequires: boost-devel >= 1.76 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -321,10 +321,10 @@ Requires: gtest %define _vespa_llvm_version 13 %endif %if 0%{?fc36} -%define _vespa_llvm_version 13 +%define _vespa_llvm_version 14 %endif %if 0%{?fc37} -%define _vespa_llvm_version 13 +%define _vespa_llvm_version 14 %endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas @@ -444,10 +444,10 @@ Requires: llvm-libs >= 12.0.0 Requires: llvm-libs >= 13.0.0 %endif %if 0%{?fc36} -Requires: llvm-libs >= 13.0.1 +Requires: llvm-libs >= 14.0.0 %endif %if 0%{?fc37} -Requires: llvm-libs >= 13.0.1 +Requires: llvm-libs >= 14.0.0 %endif %endif Requires: vespa-onnxruntime = 1.11.0 |