Skip to content

Commit

Permalink
Remove the option for vendored mimalloc
Browse files Browse the repository at this point in the history
Signed-off-by: Sher Sun <[email protected]>
  • Loading branch information
Sher Sun committed Apr 26, 2024
1 parent 854cfec commit f7b4423
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
1 change: 0 additions & 1 deletion deps/mimalloc
Submodule mimalloc deleted from 77eb3a
13 changes: 3 additions & 10 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -290,16 +290,9 @@ ifeq ($(MALLOC),jemalloc)
endif

ifeq ($(MALLOC),mimalloc)
ifeq ($(USE_SYSTEM_MIMALLOC),yes)
FINAL_CFLAGS+= -DUSE_JEMALLOC $(shell $(PKG_CONFIG) --cflags mimalloc)
FINAL_LIBS := $(shell $(PKG_CONFIG) --libs mimalloc) $(FINAL_LIBS)
else
DEPENDENCY_TARGETS+= mimalloc
MIMALLOC_DIR= ../deps/mimalloc
MIMALLOC_LIB= $(MIMALLOC_DIR)/out/release/libmimalloc.a
FINAL_CFLAGS+= -DUSE_MIMALLOC -I$(MIMALLOC_DIR)/include
FINAL_LIBS := $(MIMALLOC_LIB) $(FINAL_LIBS)
endif
FINAL_CFLAGS+= -DUSE_MIMALLOC -I/usr/local/include
FINAL_LDFLAGS+= -L/usr/local/lib
FINAL_LIBS := -lmimalloc $(FINAL_LIBS)
endif


Expand Down

0 comments on commit f7b4423

Please sign in to comment.