diff options
| author | Tor Egge <Tor.Egge@verizonmedia.com> | 2021-06-17 15:04:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 15:04:16 +0200 |
| commit | 561fdf914ad801bb486a2b9f35de96887d772b91 (patch) | |
| tree | 1cebbf822098cdd162f865155f95dd97101c345f /default_build_settings.cmake | |
| parent | aefee64fd3e7eadbb5fa3097924beb99ad68fcfb (diff) | |
| parent | 8b28e3f8ef0569e26a40b9a8f71208610b38ed12 (diff) | |
Merge pull request #18136 from vespa-engine/toregge/use-gcc-10-on-centos-7-and-8
Use gcc 10 on CentOS 7, CentOS 8, RHEL 7 and RHEL 8.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 3fd93bd0c25..a61410ebf31 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -31,11 +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) - if (VESPA_OS_DISTRO_NAME STREQUAL "CentOS Stream") - set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) - else() - set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) - endif() + set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_darwin) |