You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2019/05/20 21:22:33 UTC
[arrow] branch master updated: ARROW-5368: [C++] Disable jemalloc
by default with MinGW
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new bbe239d ARROW-5368: [C++] Disable jemalloc by default with MinGW
bbe239d is described below
commit bbe239d0e0be80612f578ea8b8033dc9f5b304f5
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue May 21 06:22:13 2019 +0900
ARROW-5368: [C++] Disable jemalloc by default with MinGW
Because we can't run autogen.sh from cmake.
We can use jemalloc installed by pacman but we can't use it. Because
we always use bundled jemalloc for now.
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #4341 from kou/cpp-mingw-disable-jemalloc-by-default and squashes the following commits:
e107efbd <Kouhei Sutou> Disable jemalloc by default with MinGW
---
ci/appveyor-cpp-build-mingw.bat | 1 -
cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat
index 552fd32..eaa6af8 100644
--- a/ci/appveyor-cpp-build-mingw.bat
+++ b/ci/appveyor-cpp-build-mingw.bat
@@ -46,7 +46,6 @@ cmake ^
-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-DARROW_VERBOSE_THIRDPARTY_BUILD=OFF ^
-DARROW_PACKAGE_PREFIX=%MINGW_PREFIX% ^
- -DARROW_JEMALLOC=OFF ^
-DARROW_USE_GLOG=OFF ^
-DARROW_PARQUET=ON ^
-DARROW_PYTHON=ON ^
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 35a1d4e..1499b88 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1127,7 +1127,7 @@ if(ARROW_WITH_PROTOBUF)
message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}")
endif()
-if(MSVC)
+if(WIN32)
# jemalloc is not supported on Windows
set(ARROW_JEMALLOC off)
endif()