This is an automated email from the ASF dual-hosted git repository.
wesm 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 45c4955 ARROW-3559: [Plasma] Static linking for plasma_store_server.
45c4955 is described below
commit 45c49557accb3942d9cc23a858103d4496ca7a07
Author: Robert Nishihara <[email protected]>
AuthorDate: Fri Oct 19 09:05:32 2018 -0400
ARROW-3559: [Plasma] Static linking for plasma_store_server.
This is related to #2744, which uses shared libraries instead of static
libraries to speed up tests and reduce disk space. This PR continues to use
shared libraries for the tests, however, for the actual plasma_store_server, I
think it's important to be able to copy the executable around and use it
without worrying about rpaths and installation.
Author: Robert Nishihara <[email protected]>
Closes #2792 from robertnishihara/plasmastatic and squashes the following
commits:
682574050 <Robert Nishihara> Add comment explaining rationale.
9a4280b01 <Robert Nishihara> Static linking for plasma_store_server.
---
cpp/src/plasma/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt
index 152190f..d697591 100644
--- a/cpp/src/plasma/CMakeLists.txt
+++ b/cpp/src/plasma/CMakeLists.txt
@@ -82,9 +82,11 @@ set(PLASMA_SRCS
thirdparty/xxhash.cc)
set(PLASMA_LINK_LIBS arrow_shared)
+set(PLASMA_STATIC_LINK_LIBS arrow_static)
if (ARROW_GPU)
set(PLASMA_LINK_LIBS ${PLASMA_LINK_LIBS} arrow_gpu_shared)
+ set(PLASMA_STATIC_LINK_LIBS ${PLASMA_STATIC_LINK_LIBS} arrow_static)
add_definitions(-DPLASMA_GPU)
endif()
@@ -128,8 +130,10 @@ if ("${COMPILER_FAMILY}" STREQUAL "gcc")
" -Wno-conversion")
endif()
+# We use static libraries for the plasma_store_server executable so that it can
+# be copied around and used in different locations.
add_executable(plasma_store_server store.cc)
-target_link_libraries(plasma_store_server plasma_shared ${PLASMA_LINK_LIBS})
+target_link_libraries(plasma_store_server plasma_static
${PLASMA_STATIC_LINK_LIBS})
if (ARROW_RPATH_ORIGIN)
if (APPLE)
