From aa22002506eb8562ec233b0518d53504e3036861 Mon Sep 17 00:00:00 2001 From: "jinli.zjw" Date: Thu, 18 Dec 2025 14:56:44 +0800 Subject: [PATCH] chore: move the location of static library linker instruction --- CMakeLists.txt | 26 ++++++++++++++------------ src/paimon/CMakeLists.txt | 4 ---- test/inte/CMakeLists.txt | 20 -------------------- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76a1830f4..428bc0f17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -326,39 +326,41 @@ if(PAIMON_BUILD_TESTS) include_directories("${CMAKE_SOURCE_DIR}/test/") set(TEST_STATIC_LINK_LIBS + "-Wl,--whole-archive" paimon_file_index_static paimon_global_index_static paimon_local_file_system_static paimon_mock_file_format_static - -Wl,--no-as-needed + "-Wl,--no-whole-archive" + "-Wl,--no-as-needed" paimon_parquet_file_format_shared paimon_blob_file_format_shared - -Wl,--as-needed) + "-Wl,--as-needed") if(PAIMON_ENABLE_LANCE) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed") list(APPEND TEST_STATIC_LINK_LIBS paimon_lance_file_format_shared) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed") endif() if(PAIMON_ENABLE_ORC) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed") list(APPEND TEST_STATIC_LINK_LIBS paimon_orc_file_format_shared) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed") endif() if(PAIMON_ENABLE_AVRO) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed") list(APPEND TEST_STATIC_LINK_LIBS paimon_avro_file_format_shared) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed") endif() if(PAIMON_ENABLE_JINDO) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed") list(APPEND TEST_STATIC_LINK_LIBS paimon_jindo_file_system_shared) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed") endif() if(PAIMON_ENABLE_LUMINA) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed") list(APPEND TEST_STATIC_LINK_LIBS paimon_lumina_index_shared) - list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed) + list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed") endif() endif() diff --git a/src/paimon/CMakeLists.txt b/src/paimon/CMakeLists.txt index 1996e6fcf..96010e981 100644 --- a/src/paimon/CMakeLists.txt +++ b/src/paimon/CMakeLists.txt @@ -401,9 +401,7 @@ if(PAIMON_BUILD_TESTS) STATIC_LINK_LIBS paimon_shared test_utils_static - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(common_factories_test @@ -537,9 +535,7 @@ if(PAIMON_BUILD_TESTS) STATIC_LINK_LIBS paimon_shared test_utils_static - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(fs_test diff --git a/test/inte/CMakeLists.txt b/test/inte/CMakeLists.txt index a0d8dc27e..be193dd27 100644 --- a/test/inte/CMakeLists.txt +++ b/test/inte/CMakeLists.txt @@ -16,90 +16,70 @@ if(PAIMON_BUILD_TESTS) add_paimon_test(blob_table_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(data_evolution_table_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(global_index_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(write_and_read_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(clean_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(read_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(scan_and_read_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(scan_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(write_inte_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) add_paimon_test(read_inte_with_index_test STATIC_LINK_LIBS paimon_shared - "-Wl,--whole-archive" ${TEST_STATIC_LINK_LIBS} - "-Wl,--no-whole-archive" test_utils_static ${GTEST_LINK_TOOLCHAIN}) endif()