wip

Signed-off-by: Federico Di Pierro <[email protected]>
falcosecurity · Nov 13, 2024 · 8b81632 · 8b81632
1 parent facfcc3
commit 8b81632
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmake/modules/tbb.cmake b/cmake/modules/tbb.cmake
@@ -55,6 +55,7 @@ else()
 		endif()
 	endif()
 	set(TBB_LIB "${TBB_LIB_BASEDIR}/${TBB_LIB_PREFIX}${TBB_LIB_BASENAME}${TBB_LIB_SUFFIX}")
+	set(TBB_MEMPROXY_LIB "${TBB_LIB_BASEDIR}/${TBB_LIB_PREFIX}tbbmalloc_proxy${TBB_LIB_SUFFIX}")
 
 	if(NOT TARGET tbb)
 		message(STATUS "Using bundled tbb in '${TBB_SRC}'")
@@ -89,7 +90,7 @@ else()
 						   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 						   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
 						   -DEMSCRIPTEN=${TBB_EMSCRIPTEN}
-				BUILD_BYPRODUCTS ${TBB_LIB}
+				BUILD_BYPRODUCTS ${TBB_LIB} ${TBB_MEMPROXY_LIB}
 				INSTALL_COMMAND ""
 			)
 		else()
@@ -110,7 +111,7 @@ else()
 							   -DTBB_OUTPUT_DIR_BASE=lib
 							   -DCMAKE_CXX_FLAGS="${TBB_FLAGS}"
 							   -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_PIC}
-					BUILD_BYPRODUCTS ${TBB_LIB}
+					BUILD_BYPRODUCTS ${TBB_LIB} ${TBB_MEMPROXY_LIB}
 					INSTALL_COMMAND ""
 				)
 			else()

diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
@@ -167,7 +167,7 @@ if(NOT EMSCRIPTEN)
 	target_link_libraries(
 		sinsp
 		INTERFACE "${CARES_LIB}"
-		PRIVATE "${TBB_LIB}"
+		PRIVATE "${TBB_LIB} ${TBB_MEMPROXY_LIB}"
 	)
 endif()