Link against snmalloc (#7137)

Author: eddyashton

CMakeLists.txt

@@ -117,6 +117,11 @@ endif()
 # This option controls whether to link virtual builds against snmalloc rather
 # than use the system allocator.
 option(USE_SNMALLOC "Link against snmalloc" ON)
+if(USE_SNMALLOC)
+  set(SNMALLOC_BUILD_TESTING OFF)
+  set(SNMALLOC_STATIC_LIBRARY_PREFIX "")
+  add_subdirectory(3rdparty/exported/snmalloc EXCLUDE_FROM_ALL)
+endif()
 
 # Useful for debugging with libc++ hardening options
 option(USE_LIBCXX "Use libc++ instead of libstdc++" OFF)
@@ -208,19 +213,6 @@ include(${CCF_DIR}/cmake/qcbor.cmake)
 include(${CCF_DIR}/cmake/t_cose.cmake)
 
 # Launcher library
-if(SAN
-   OR TSAN
-   OR NOT USE_SNMALLOC
-)
-  set(SNMALLOC_COMPILE_OPTIONS "")
-else()
-  set(SNMALLOC_HEADER_ONLY_LIBRARY ON)
-  add_subdirectory(3rdparty/exported/snmalloc EXCLUDE_FROM_ALL)
-  set(SNMALLOC_COMPILE_OPTIONS "-mcx16")
-  set(SNMALLOC_INCLUDE_DIRS 3rdparty/exported/snmalloc/src)
-  list(APPEND CCF_LAUNCHER_SOURCES src/host/snmalloc.cpp)
-endif()
-
 list(APPEND CCF_LAUNCHER_SOURCES ${CCF_DIR}/src/host/run.cpp
      ${CCF_DIR}/src/host/env.cpp
 )
@@ -238,10 +230,7 @@ add_ccf_static_library(
             http_parser
 )
 
-target_include_directories(
-  ccf_launcher PRIVATE ${CCF_GENERATED_DIR} ${SNMALLOC_INCLUDE_DIRS}
-)
-target_compile_options(ccf_launcher PRIVATE ${SNMALLOC_COMPILE_OPTIONS})
+target_include_directories(ccf_launcher PRIVATE ${CCF_GENERATED_DIR})
 
 # HTTP parser
 add_library(http_parser "${HTTP_PARSER_SOURCES}")

cmake/ccf_app.cmake

@@ -48,6 +48,12 @@ function(add_ccf_app name)
   add_san(${name})
   add_tidy(${name})
 
+  if(USE_SNMALLOC)
+    target_link_libraries(
+      ${name} INTERFACE snmalloc-new-override snmallocshim-static
+    )
+  endif()
+
   add_dependencies(${name} ${name})
   if(PARSED_ARGS_DEPS)
     add_dependencies(${name} ${PARSED_ARGS_DEPS})
@@ -81,4 +87,10 @@ function(add_ccf_static_library name)
       DESTINATION lib
     )
   endif()
+
+  if(USE_SNMALLOC)
+    target_link_libraries(
+      ${name} INTERFACE snmalloc-new-override snmallocshim-static
+    )
+  endif()
 endfunction()