diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-26 18:08:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 18:08:47 +0200 |
| commit | bbc79e913fce52a52c76c3427d5d655e59955acf (patch) | |
| tree | 7aa23b82431c4f755628249086879793236b5547 | |
| parent | 5a805b976c8283a2909f618b9ab73efec2752a11 (diff) | |
| parent | b2b07d1b17dbd8a759eb1ec2814ba51fc4a35627 (diff) | |
Merge pull request #24224 from vespa-engine/toregge/libcxx-15-doesnt-have-std-unary-functionv8.59.13
libc++ 15 doesn't have std::unary_function.
| -rw-r--r-- | build_settings.cmake | 3 | ||||
| -rw-r--r-- | default_build_settings.cmake | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index a6e2490f117..0976e73442e 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -85,6 +85,9 @@ else() endif() if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGOOGLE_PROTOBUF_NO_RDTSC") + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE") + endif() endif() # Linker flags diff --git a/default_build_settings.cmake b/default_build_settings.cmake index fe17192b6b8..08f5e7d14da 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -40,7 +40,7 @@ endfunction() function(setup_vespa_default_build_settings_darwin) message("-- Setting up default build settings for darwin") - set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "15" PARENT_SCOPE) set(DEFAULT_CMAKE_PREFIX_PATH "${VESPA_DEPS}" "/usr/local/opt/bison" "/usr/local/opt/flex" "/usr/local/opt/openssl@1.1" "/usr/local/opt/openblas" "/usr/local/opt/icu4c" PARENT_SCOPE) set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" "/usr/local/opt/bison/lib" "/usr/local/opt/flex/lib" "/usr/local/opt/icu4c/lib" "/usr/local/opt/openssl@1.1/lib" "/usr/local/opt/openblas/lib") list(APPEND DEFAULT_EXTRA_LINK_DIRECTORY "/usr/local/lib") |