fix(cmake,userspace): fix usage and build of mimalloc.

Signed-off-by: Federico Di Pierro <[email protected]>

Author: FedeDP

cmake/modules/mimalloc.cmake

@@ -47,20 +47,30 @@ else()
 		set(MIMALLOC_LIB_BASENAME "libmimalloc")
 	endif()
 	set(MALLOC_LIB "${MIMALLOC_SRC}/malloc-build/${MIMALLOC_LIB_BASENAME}${MIMALLOC_LIB_SUFFIX}")
-	set(MIMALLOC_INCLUDE ${MIMALLOC_SRC}/include/)
+	set(MIMALLOC_INCLUDE ${MIMALLOC_SRC}/malloc/include/)
 
+	# To avoid recent clang versions complaining with "error: expansion of date or time macro is not
+	# reproducible" while building mimalloc, we force-set both variables.
+	string(TIMESTAMP DATE "%Y%m%d")
+	string(TIMESTAMP TIME "%H:%M")
+	set(MIMALLOC_EXTRA_CPPDEFS __DATE__="${DATE}",__TIME__="${TIME}")
+
+	# We disable arch specific optimization because of issues with building with zig. Optimizations
+	# would be only effective on arm64. See MI_NO_OPT_ARCH=On.
 	ExternalProject_Add(
 		malloc
 		PREFIX "${PROJECT_BINARY_DIR}/mimalloc-prefix"
 		URL "https://github.com/microsoft/mimalloc/archive/refs/tags/v3.1.5.tar.gz"
 		URL_HASH "SHA256=1c6949032069d5ebea438ec5cedd602d06f40a92ddf0f0d9dcff0993e5f6635c"
+		LIST_SEPARATOR "," # to pass MIMALLOC_EXTRA_CPPDEFS as list
 		CMAKE_ARGS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
 				   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 				   -DMI_BUILD_SHARED=${BUILD_SHARED_LIBS}
 				   -DMI_BUILD_STATIC=${BUILD_STATIC}
 				   -DMI_BUILD_TESTS=Off
 				   -DMI_BUILD_OBJECT=Off
-				   -DMI_OPT_ARCH=On
+				   -DMI_NO_OPT_ARCH=On
+				   -DMI_EXTRA_CPPDEFS=${MIMALLOC_EXTRA_CPPDEFS}
 		INSTALL_COMMAND ""
 		UPDATE_COMMAND ""
 		BUILD_BYPRODUCTS ${MALLOC_LIB}

userspace/falco/CMakeLists.txt

@@ -137,14 +137,12 @@ endif()
 target_compile_definitions(falco_application PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
 
 add_dependencies(falco_application ${FALCO_DEPENDENCIES})
-
-target_link_libraries(falco_application ${FALCO_LIBRARIES})
-
+target_link_libraries(falco_application PUBLIC ${FALCO_LIBRARIES})
 target_include_directories(falco_application PUBLIC ${FALCO_INCLUDE_DIRECTORIES})
 
 add_executable(falco falco.cpp)
-add_dependencies(falco falco_application ${FALCO_DEPENDENCIES})
-target_link_libraries(falco falco_application ${FALCO_LIBRARIES})
+add_dependencies(falco falco_application)
+target_link_libraries(falco falco_application)
 target_include_directories(falco PUBLIC ${FALCO_INCLUDE_DIRECTORIES})
 
 if(EMSCRIPTEN)

userspace/falco/falco.cpp

@@ -15,10 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifdef HAS_MIMALLOC
-#include <mimalloc-new-delete.h>
-#endif
-
 #include <stdio.h>
 #include <string>