Skip to content

ARROW-739: [C++] Target arrow_jemalloc_objlib with EP dependency to avoid race condition in parallel builds #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 2 commits into from
Closed

ARROW-739: [C++] Target arrow_jemalloc_objlib with EP dependency to avoid race condition in parallel builds #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c706284
Target arrow_jemalloc_objlib with EP dependency to avoid race conditi…
wesm Mar 30, 2017
0096c95
Add INSTALL_COMMAND
wesm Mar 30, 2017
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: 3 additions & 6 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,13 +629,15 @@ if (ARROW_JEMALLOC)
CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix="
BUILD_IN_SOURCE 1
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install
BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}")
else()
ExternalProject_Add(jemalloc_ep
URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2
CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix="
BUILD_IN_SOURCE 1
BUILD_COMMAND ${MAKE})
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install)
endif()
else()
set(JEMALLOC_VENDORED 0)
Expand All @@ -645,11 +647,6 @@ if (ARROW_JEMALLOC)
ADD_THIRDPARTY_LIB(jemalloc
STATIC_LIB ${JEMALLOC_STATIC_LIB}
SHARED_LIB ${JEMALLOC_SHARED_LIB})

if (JEMALLOC_VENDORED)
add_dependencies(jemalloc_shared jemalloc_ep)
add_dependencies(jemalloc_static jemalloc_ep)
endif()
endif()

## Google PerfTools
Expand Down
4 changes: 4 additions & 0 deletions cpp/src/arrow/jemalloc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ ADD_ARROW_LIB(arrow_jemalloc
STATIC_PRIVATE_LINK_LIBS ${ARROW_JEMALLOC_STATIC_PRIVATE_LINK_LIBS}
)

if(JEMALLOC_VENDORED)
add_dependencies(arrow_jemalloc_objlib jemalloc_ep)
endif()

ADD_ARROW_TEST(jemalloc-memory_pool-test)
ARROW_TEST_LINK_LIBRARIES(jemalloc-memory_pool-test
${ARROW_JEMALLOC_TEST_LINK_LIBS})
Expand Down