From e83650177d0ecad10002e886bd914b1624ea9a4e Mon Sep 17 00:00:00 2001
From: David Li
Date: Wed, 14 Apr 2021 09:59:02 -0400
Subject: [PATCH] ARROW-11475: [C++] Revert "Upgrade mimalloc"
This reverts commit 8780ca4b12d30a0118c3114edcad27da907d8e7c.
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++--
cpp/thirdparty/versions.txt | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 3f686346bb1..923e18bafb9 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1561,10 +1561,10 @@ if(ARROW_MIMALLOC)
endif()
set(MIMALLOC_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/mimalloc_ep/src/mimalloc_ep")
- set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_PREFIX}/lib/mimalloc-2.0/include")
+ set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_PREFIX}/lib/mimalloc-1.6/include")
set(
MIMALLOC_STATIC_LIB
- "${MIMALLOC_PREFIX}/lib/mimalloc-2.0/${CMAKE_STATIC_LIBRARY_PREFIX}${MIMALLOC_LIB_BASE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ "${MIMALLOC_PREFIX}/lib/mimalloc-1.6/${CMAKE_STATIC_LIBRARY_PREFIX}${MIMALLOC_LIB_BASE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
set(MIMALLOC_CMAKE_ARGS
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index e5ab78c3822..637435d19b4 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -40,7 +40,9 @@ ARROW_GRPC_BUILD_VERSION=v1.35.0
ARROW_GTEST_BUILD_VERSION=1.10.0
ARROW_JEMALLOC_BUILD_VERSION=5.2.1
ARROW_LZ4_BUILD_VERSION=v1.9.3
-ARROW_MIMALLOC_BUILD_VERSION=v2.0.0
+# mimalloc 1.6.7 didn't build on Visual Studio 2015
+# https://github.com/microsoft/mimalloc/issues/353
+ARROW_MIMALLOC_BUILD_VERSION=v1.6.4
ARROW_ORC_BUILD_VERSION=1.6.6
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require