diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-17 15:09:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 15:09:22 +0200 |
| commit | 529694a88d48270298171fdcb87d1439f183202b (patch) | |
| tree | 56cdddc8456d16a8d894b8c158211b9fb0e7e40c | |
| parent | d3f3a0ddd56d2cefcf4b0ff2867e169db300087f (diff) | |
| parent | 2f8559a1918232abdfd659c926690aa128c54427 (diff) | |
Merge pull request #14071 from vespa-engine/toregge/use-gcc-10-on-darwin
Use gcc 10 on darwin.
| -rw-r--r-- | default_build_settings.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index e786da5d1fb..69a69dc1860 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -278,8 +278,8 @@ function(vespa_use_default_cxx_compiler) unset(DEFAULT_CMAKE_CXX_COMPILER) if(NOT DEFINED VESPA_COMPILER_VARIANT OR VESPA_COMPILER_VARIANT STREQUAL "gcc") if(APPLE) - set(DEFAULT_CMAKE_C_COMPILER "/usr/local/bin/gcc-9") - set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/bin/g++-9") + set(DEFAULT_CMAKE_C_COMPILER "/usr/local/bin/gcc-10") + set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/bin/g++-10") endif() elseif(VESPA_COMPILER_VARIANT STREQUAL "clang") if(APPLE) |