Merge pull request #24224 from vespa-engine/toregge/libcxx-15-doesnt-…

…have-std-unary-function libc++ 15 doesn't have std::unary_function.
vespa-engine · Sep 26, 2022 · bbc79e9 · bbc79e9
2 parents 5a805b9 + b2b07d1
commit bbc79e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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/[email protected]" "/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/[email protected]/lib" "/usr/local/opt/openblas/lib")
   list(APPEND DEFAULT_EXTRA_LINK_DIRECTORY "/usr/local/lib")