From 5e15bd935e89be6f3507e2bfbc60d64c3882faea Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Wed, 26 Jun 2024 15:53:49 +0100 Subject: [PATCH] CMake: Disable glibc jemalloc for MinGW builds --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b4a5852a..710c75833 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ if (NOT CONTAINS_MINGW EQUAL -1) message (STATUS "Mingw build") set (MINGW_BUILD TRUE) set (ENABLE_JEMALLOC FALSE) + set (ENABLE_JEMALLOC_GLIBC_ALLOC FALSE) endif() if (NOT MINGW_BUILD) @@ -195,7 +196,7 @@ if (ENABLE_JEMALLOC_GLIBC_ALLOC) # All host native libraries will use this allocator, while *most* other FEX internal allocations will use the other jemalloc allocator. add_definitions(-DENABLE_JEMALLOC_GLIBC=1) add_subdirectory(External/jemalloc_glibc/) -else() +elseif (NOT MINGW_BUILD) message (STATUS " jemalloc glibc allocator disabled!\n" " This is not a recommended configuration!\n" @@ -208,7 +209,7 @@ if (ENABLE_JEMALLOC) add_definitions(-DENABLE_JEMALLOC=1) add_subdirectory(External/jemalloc/) include_directories(External/jemalloc/pregen/include/) -else() +elseif (NOT MINGW_BUILD) message (STATUS " jemalloc disabled!\n" " This is not a recommended configuration!\n"