This is an automated email from the ASF dual-hosted git repository. apitrou pushed a commit to branch revert-39629-use-j1-328 in repository https://gitbox.apache.org/repos/asf/arrow.git
commit 7792f40e020b6e2603122ffc84dc5842e3a33a10 Author: Antoine Pitrou <[email protected]> AuthorDate: Mon Jan 22 14:57:03 2024 +0100 Revert "GH-39628: [C++] Use -j1 for cmake >= 3.28" --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 1f5cd3a2b4..6bb9c0f6af 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -1005,13 +1005,8 @@ if("${MAKE}" STREQUAL "") endif() endif() -# Args for external projects using make -if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.28") - # Prevent 'bad file descriptor' error see #39517 #39628 - set(MAKE_BUILD_ARGS "-j1") -else() - set(MAKE_BUILD_ARGS "-j${NPROC}") -endif() +# Args for external projects using make. +set(MAKE_BUILD_ARGS "-j${NPROC}") include(FetchContent) set(FC_DECLARE_COMMON_OPTIONS) @@ -2639,7 +2634,7 @@ macro(build_bzip2) BUILD_IN_SOURCE 1 BUILD_COMMAND ${MAKE} libbz2.a ${MAKE_BUILD_ARGS} ${BZIP2_EXTRA_ARGS} - INSTALL_COMMAND ${MAKE} install -j1 PREFIX=${BZIP2_PREFIX} + INSTALL_COMMAND ${MAKE} install PREFIX=${BZIP2_PREFIX} ${BZIP2_EXTRA_ARGS} INSTALL_DIR ${BZIP2_PREFIX} URL ${ARROW_BZIP2_SOURCE_URL}
