File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -94,6 +94,14 @@ if(SILKWORM_SANITIZE_COMPILER_OPTIONS)
94
94
# cmake-format: on
95
95
endif ()
96
96
97
+ if (SILKWORM_USE_MIMALLOC )
98
+ # Do not use mimalloc override on sanitizer builds (https://github.com/microsoft/mimalloc/issues/317#issuecomment-708506405)
99
+ # Moreover, mimalloc override causes a crash on macOS at startup in rpcdaemon, so we just enable it on Linux
100
+ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT SILKWORM_SANITIZE )
101
+ list (APPEND CONAN_OPTIONS "mimalloc:override=True" )
102
+ endif ()
103
+ endif ()
104
+
97
105
conan_cmake_install (
98
106
PATH_OR_REFERENCE "${CONAN_BINARY_DIR} "
99
107
INSTALL_FOLDER "${CONAN_BINARY_DIR} "
Original file line number Diff line number Diff line change @@ -58,10 +58,6 @@ def configure(self):
58
58
if self .settings .os == 'Windows' :
59
59
return
60
60
61
- # mimalloc override=True causes a crash on macOS at startup in rpcdaemon, so we just enable it on Linux
62
- if self .settings .os == 'Linux' :
63
- self .options ['mimalloc' ].override = True
64
-
65
61
# Disable Catch2 version 3.x.x signaling handling on WASM
66
62
if self .settings .arch == 'wasm' :
67
63
self .options ['catch2' ].no_posix_signals = True
You can’t perform that action at this time.
0 commit comments