This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 904f1d113e [VL] Do not use --version-script link option on Darwin
(#7820)
904f1d113e is described below
commit 904f1d113e32797c53206245fd4e0b48d53baa6c
Author: PHILO-HE <[email protected]>
AuthorDate: Fri Nov 8 17:22:28 2024 +0800
[VL] Do not use --version-script link option on Darwin (#7820)
---
cpp/velox/CMakeLists.txt | 4 ++--
cpp/velox/symbols.map | 2 +-
cpp/velox/tests/CMakeLists.txt | 8 +++-----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt
index b16de0032a..17defc498e 100644
--- a/cpp/velox/CMakeLists.txt
+++ b/cpp/velox/CMakeLists.txt
@@ -197,8 +197,8 @@ endif()
add_library(velox SHARED ${VELOX_SRCS})
-if(ENABLE_GLUTEN_VCPKG)
- # Hide symbols of static dependencies
+if(ENABLE_GLUTEN_VCPKG AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ # Hide some symbols to avoid conflict.
target_link_options(
velox PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
endif()
diff --git a/cpp/velox/symbols.map b/cpp/velox/symbols.map
index 525faf3526..427560c8f1 100644
--- a/cpp/velox/symbols.map
+++ b/cpp/velox/symbols.map
@@ -9,6 +9,6 @@
JNI_OnLoad;
JNI_OnUnload;
local:
- # Hide symbols of static dependencies
+ # Hide all other symbols except the above global symbols.
*;
};
diff --git a/cpp/velox/tests/CMakeLists.txt b/cpp/velox/tests/CMakeLists.txt
index c4cf6bfb07..55cab34266 100644
--- a/cpp/velox/tests/CMakeLists.txt
+++ b/cpp/velox/tests/CMakeLists.txt
@@ -26,11 +26,9 @@ function(add_velox_test TEST_EXEC)
message(FATAL_ERROR "No sources specified for test ${TEST_NAME}")
endif()
add_executable(${TEST_EXEC} ${SOURCES} ${VELOX_TEST_COMMON_SRCS})
- target_include_directories(
- ${TEST_EXEC} PRIVATE ${CMAKE_SOURCE_DIR}/velox ${CMAKE_SOURCE_DIR}/src
- ${VELOX_BUILD_PATH}/_deps/duckdb-src/src/include)
- target_link_libraries(${TEST_EXEC} velox GTest::gtest GTest::gtest_main
- google::glog)
+ target_include_directories(${TEST_EXEC} PRIVATE ${CMAKE_SOURCE_DIR}/velox
+ ${CMAKE_SOURCE_DIR}/src)
+ target_link_libraries(${TEST_EXEC} velox GTest::gtest GTest::gtest_main)
gtest_discover_tests(${TEST_EXEC} DISCOVERY_MODE PRE_TEST)
endfunction()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
