Skip to content

Commit 1880d3a

Browse files
authored
GH-49042: [C++] Remove mimalloc patch (#49041)
### Rationale for this change This patch was integrated upstream in microsoft/mimalloc#1139 ### Are these changes tested? By existing CI. ### Are there any user-facing changes? No. * GitHub Issue: #49042 Authored-by: Antoine Pitrou <antoine@python.org> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 0e9e32f commit 1880d3a

File tree

2 files changed

+0
-41
lines changed

2 files changed

+0
-41
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2343,13 +2343,6 @@ if(ARROW_MIMALLOC)
23432343
set(MIMALLOC_C_FLAGS "${MIMALLOC_C_FLAGS} -DERROR_COMMITMENT_MINIMUM=635")
23442344
endif()
23452345

2346-
set(MIMALLOC_PATCH_COMMAND "")
2347-
if(${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG")
2348-
find_program(PATCH patch REQUIRED)
2349-
set(MIMALLOC_PATCH_COMMAND ${PATCH} -p1 -i
2350-
${CMAKE_CURRENT_LIST_DIR}/mimalloc-1138.patch)
2351-
endif()
2352-
23532346
set(MIMALLOC_CMAKE_ARGS
23542347
${EP_COMMON_CMAKE_ARGS}
23552348
"-DCMAKE_C_FLAGS=${MIMALLOC_C_FLAGS}"
@@ -2367,7 +2360,6 @@ if(ARROW_MIMALLOC)
23672360
${EP_COMMON_OPTIONS}
23682361
URL ${MIMALLOC_SOURCE_URL}
23692362
URL_HASH "SHA256=${ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM}"
2370-
PATCH_COMMAND ${MIMALLOC_PATCH_COMMAND}
23712363
CMAKE_ARGS ${MIMALLOC_CMAKE_ARGS}
23722364
BUILD_BYPRODUCTS "${MIMALLOC_STATIC_LIB}")
23732365

cpp/cmake_modules/mimalloc-1138.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)