diff options
author | Tor Egge <Tor.Egge@verizonmedia.com> | 2021-04-30 00:51:59 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@verizonmedia.com> | 2021-04-30 00:51:59 +0200 |
commit | d023c883b770785ab571de85027c8cf6cb5787dc (patch) | |
tree | e3189e5a0de05f51fd4cb293f43699ac1905ad57 /default_build_settings.cmake | |
parent | 68871297a90770f91edfaea0569dc4dada4a3baf (diff) |
Use gcc10-gcc and gcc10-g++ on Amazon Linux 2.
Diffstat (limited to 'default_build_settings.cmake')
-rw-r--r-- | default_build_settings.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 141b9e61bdb..326481e25c7 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -85,6 +85,13 @@ function(setup_vespa_default_build_settings_fedora_35) set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_amzn_2) + message("-- Setting up default build settings for amzn 2") + 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_ubuntu) message("-- Setting up default build settings for ubuntu") SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) @@ -194,6 +201,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_fedora_34() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 35") setup_vespa_default_build_settings_fedora_35() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") + setup_vespa_default_build_settings_amzn_2() elseif(VESPA_OS_DISTRO STREQUAL "ubuntu") setup_vespa_default_build_settings_ubuntu() elseif(VESPA_OS_DISTRO STREQUAL "debian") @@ -295,6 +304,9 @@ function(vespa_use_default_cxx_compiler) if(APPLE) set(DEFAULT_CMAKE_C_COMPILER "/usr/local/bin/gcc-10") set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/bin/g++-10") + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") + set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/gcc10-gcc") + set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/gcc10-g++") endif() elseif(VESPA_COMPILER_VARIANT STREQUAL "clang") if(APPLE) |