Merge pull request rui314#349 from dmantipov/use-explicit-mimalloc-ne…

…w-delete-overrides-if-system-mimalloc Use explicit mimalloc new/delete overrides if SYSTEM_MIMALLOC
dmiller423 · Feb 17, 2022 · fcb2816 · fcb2816
2 parents b57da54 + 630b262
commit fcb2816
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -71,6 +71,7 @@ endif
 
 ifeq ($(USE_MIMALLOC), 1)
   ifdef SYSTEM_MIMALLOC
+    MOLD_CXXFLAGS += -DSYSTEM_MIMALLOC=1
     MOLD_LDFLAGS += -lmimalloc
   else
     MIMALLOC_LIB = out/mimalloc/libmimalloc.a

diff --git a/main.cc b/main.cc
@@ -1,3 +1,7 @@
+#if defined(SYSTEM_MIMALLOC)
+#include <mimalloc-new-delete.h>
+#endif
+
 #include "elf/mold.h"
 #include "macho/mold.h"