Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2558,7 +2558,7 @@ if(ARROW_MIMALLOC)
set(MIMALLOC_C_FLAGS ${EP_C_FLAGS})
if(MINGW)
# Workaround https://github.com/microsoft/mimalloc/issues/910 on RTools40
# This is still required as of mimalloc 3.3.1, tested as part of GH-49772
# This is still required as of mimalloc 3.4.1, tested as part of GH-50471
set(MIMALLOC_C_FLAGS "${MIMALLOC_C_FLAGS} -DERROR_COMMITMENT_MINIMUM=635")
endif()

Expand All @@ -2567,8 +2567,15 @@ if(ARROW_MIMALLOC)
"-DCMAKE_C_FLAGS=${MIMALLOC_C_FLAGS}"
"-DCMAKE_INSTALL_PREFIX=${MIMALLOC_PREFIX}"
-DMI_INSTALL_TOPLEVEL=ON
# Don't override default malloc
-DMI_OVERRIDE=OFF
-DMI_OSX_INTERPOSE=OFF
-DMI_OSX_ZONE=OFF
Comment on lines 2569 to +2573
# Allow usage through dlopen (i.e. when libarrow.so itself is dlopen'ed)
-DMI_LOCAL_DYNAMIC_TLS=ON
# GH-50428: Make sure several mimalloc instances can cohabit in the same process
# (also https://github.com/microsoft/mimalloc/issues/1327#issuecomment-4964140817)
-DMI_TLS_MODEL_LOCAL=ON
-DMI_BUILD_OBJECT=OFF
-DMI_BUILD_SHARED=OFF
-DMI_BUILD_TESTS=OFF
Expand Down
4 changes: 2 additions & 2 deletions cpp/thirdparty/versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ ARROW_JEMALLOC_BUILD_VERSION=5.3.0
ARROW_JEMALLOC_BUILD_SHA256_CHECKSUM=2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa
ARROW_LZ4_BUILD_VERSION=v1.10.0
ARROW_LZ4_BUILD_SHA256_CHECKSUM=537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b
ARROW_MIMALLOC_BUILD_VERSION=v3.3.1
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=42c16914168ac6741eeb407e83b93a12b2b7ee25a7e14e6b4807fab8b577a540
ARROW_MIMALLOC_BUILD_VERSION=v3.4.1
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=37107a52c16baa80c5f74861dddda7b27bb9949e41a6637691867a94c88ca446
Comment thread
raulcd marked this conversation as resolved.
ARROW_NLOHMANN_JSON_BUILD_VERSION=v3.12.0
ARROW_NLOHMANN_JSON_BUILD_SHA256_CHECKSUM=4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187
ARROW_OPENTELEMETRY_BUILD_VERSION=v1.21.0
Expand Down
Loading