From 9e5cfdfddfc8ac7bd0185d1aaa48869490760344 Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Fri, 18 Feb 2022 14:36:00 +0100
Subject: [PATCH] Fix boost with clang on Linux and fix exclude rules for bad
 tests

---
 deps/Boost/Boost.cmake     | 10 ++++++----
 deps/Boost/user-config.jam |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake
index 823385981..d04921d22 100644
--- a/deps/Boost/Boost.cmake
+++ b/deps/Boost/Boost.cmake
@@ -11,8 +11,8 @@ endif()
 set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
     set(_boost_toolset gcc)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
     set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
@@ -38,7 +38,9 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     if (WIN32)
         set(_boost_toolset "clang-win")
     else()
-        set(_boost_toolset "clang")
+        set(_boost_toolset clang)
+        configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
+        set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
     endif()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
     set(_boost_toolset "intel")
@@ -71,7 +73,7 @@ ProcessorCount(NPROC)
 file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
 
 set(_boost_flags "")
-if (UNIX) 
+if (UNIX)
     set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
 elseif(APPLE)
     set(_boost_flags 
@@ -156,4 +158,4 @@ if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
     )
     # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
     list(APPEND _dep_list "dep_boost_polygon")
-endif ()
\ No newline at end of file
+endif ()
diff --git a/deps/Boost/user-config.jam b/deps/Boost/user-config.jam
index eff13db28..6d86ef8df 100644
--- a/deps/Boost/user-config.jam
+++ b/deps/Boost/user-config.jam
@@ -1 +1 @@
-using gcc : : @CMAKE_CXX_COMPILER@ ;
\ No newline at end of file
+using @_boost_toolset@ : : @CMAKE_CXX_COMPILER@ ;
\ No newline at end of file