snmalloc: disable when _FORTIFY_SOURCE or _GLIBCXX_ASSERTIONS are there.

See microsoft/snmalloc#732
ossia · Jan 18, 2025 · 522cd68 · 522cd68
1 parent 11ef87a
commit 522cd68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/3rdparty/mimalloc.cmake b/3rdparty/mimalloc.cmake
@@ -10,11 +10,20 @@ if(SCORE_HAS_SANITIZERS)
   return()
 endif()
 
+if("${CMAKE_CXX_FLAGS}" MATCHES ".*_FORTIFY_SOURCE.*")
+  return()
+endif()
+if("${CMAKE_CXX_FLAGS}" MATCHES ".*_GLIBCXX_ASSERTIONS.*")
+  return()
+endif()
+
 if(SCORE_USE_SYSTEM_LIBRARIES)
   find_package(snmalloc GLOBAL CONFIG)
 else()
   block()
-    set(SNMALLOC_BUILD_TESTING OFF CACHE INTERNAL "" FORCE)
-    add_subdirectory(3rdparty/snmalloc SYSTEM)
+  set(SNMALLOC_BUILD_TESTING
+      OFF
+      CACHE INTERNAL "" FORCE)
+  add_subdirectory(3rdparty/snmalloc SYSTEM)
   endblock()
 endif()
diff --git a/3rdparty/snmalloc b/3rdparty/snmalloc