Skip to content

Commit 3cd3aa4

Browse files
koumeta-codesync[bot]
authored andcommitted
build: Don't use CMAKE_INSTALL_LIBDIR in bundled Apache Arrow (facebookincubator#15260)
Summary: `CMAKE_INSTALL_LIBDIR` is defined by `GNUInstallDirs` but we don't include it. So it's not defined. If it's not defined, the following error may be occurred: ```text : && /bin/clang++-17 ... -shared -Wl,-soname,libvelox.so -o lib/libvelox.so ... CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a ... && : clang++-17: error: no such file or directory: 'CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a' clang++-17: error: no such file or directory: 'CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a' clang++-17: error: no such file or directory: 'CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a' clang++-17: error: no such file or directory: 'CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a' clang++-17: error: no such file or directory: 'CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a' clang++-17: error: no such file or directory: 'CMake/resolve_dependency_modules/arrow/arrow_ep/install//libarrow.a' ``` Pull Request resolved: facebookincubator#15260 Reviewed By: kagamiori Differential Revision: D85962181 Pulled By: kevinwilfong fbshipit-source-id: 617bdc26c8269a6e1ba8e94f34a1bfed874cdeed
1 parent 93869d5 commit 3cd3aa4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

CMake/resolve_dependency_modules/arrow/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ if(VELOX_ENABLE_ARROW)
3535
-DARROW_RUNTIME_SIMD_LEVEL=NONE
3636
-DARROW_WITH_UTF8PROC=OFF
3737
-DARROW_TESTING=ON
38+
-DCMAKE_INSTALL_LIBDIR=lib
3839
-DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}/install
3940
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
4041
-DARROW_BUILD_STATIC=ON
@@ -44,7 +45,7 @@ if(VELOX_ENABLE_ARROW)
4445
# Remove with Arrow upgrade to Arrow 20.
4546
-DARROW_CXXFLAGS=-Wno-documentation
4647
)
47-
set(ARROW_LIBDIR ${ARROW_PREFIX}/install/${CMAKE_INSTALL_LIBDIR})
48+
set(ARROW_LIBDIR ${ARROW_PREFIX}/install/lib)
4849

4950
add_library(thrift STATIC IMPORTED GLOBAL)
5051
if(NOT Thrift_FOUND)

0 commit comments

Comments
 (0)