Skip to content

Commit c11112f

Browse files
zjw1111zjw1111
authored
chore: move the location of static library linker instruction (#20)
1 parent 1ecea8e commit c11112f

File tree

3 files changed

+14
-36
lines changed

3 files changed

+14
-36
lines changed

‎CMakeLists.txt‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -326,39 +326,41 @@ if(PAIMON_BUILD_TESTS)
326326
include_directories("${CMAKE_SOURCE_DIR}/test/")
327327

328328
set(TEST_STATIC_LINK_LIBS
329+
"-Wl,--whole-archive"
329330
paimon_file_index_static
330331
paimon_global_index_static
331332
paimon_local_file_system_static
332333
paimon_mock_file_format_static
333-
-Wl,--no-as-needed
334+
"-Wl,--no-whole-archive"
335+
"-Wl,--no-as-needed"
334336
paimon_parquet_file_format_shared
335337
paimon_blob_file_format_shared
336-
-Wl,--as-needed)
338+
"-Wl,--as-needed")
337339

338340
if(PAIMON_ENABLE_LANCE)
339-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed)
341+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
340342
list(APPEND TEST_STATIC_LINK_LIBS paimon_lance_file_format_shared)
341-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed)
343+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
342344
endif()
343345
if(PAIMON_ENABLE_ORC)
344-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed)
346+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
345347
list(APPEND TEST_STATIC_LINK_LIBS paimon_orc_file_format_shared)
346-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed)
348+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
347349
endif()
348350
if(PAIMON_ENABLE_AVRO)
349-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed)
351+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
350352
list(APPEND TEST_STATIC_LINK_LIBS paimon_avro_file_format_shared)
351-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed)
353+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
352354
endif()
353355
if(PAIMON_ENABLE_JINDO)
354-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed)
356+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
355357
list(APPEND TEST_STATIC_LINK_LIBS paimon_jindo_file_system_shared)
356-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed)
358+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
357359
endif()
358360
if(PAIMON_ENABLE_LUMINA)
359-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--no-as-needed)
361+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
360362
list(APPEND TEST_STATIC_LINK_LIBS paimon_lumina_index_shared)
361-
list(APPEND TEST_STATIC_LINK_LIBS -Wl,--as-needed)
363+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
362364
endif()
363365

364366
endif()

‎src/paimon/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,7 @@ if(PAIMON_BUILD_TESTS)
401401
STATIC_LINK_LIBS
402402
paimon_shared
403403
test_utils_static
404-
"-Wl,--whole-archive"
405404
${TEST_STATIC_LINK_LIBS}
406-
"-Wl,--no-whole-archive"
407405
${GTEST_LINK_TOOLCHAIN})
408406

409407
add_paimon_test(common_factories_test
@@ -537,9 +535,7 @@ if(PAIMON_BUILD_TESTS)
537535
STATIC_LINK_LIBS
538536
paimon_shared
539537
test_utils_static
540-
"-Wl,--whole-archive"
541538
${TEST_STATIC_LINK_LIBS}
542-
"-Wl,--no-whole-archive"
543539
${GTEST_LINK_TOOLCHAIN})
544540

545541
add_paimon_test(fs_test

‎test/inte/CMakeLists.txt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,90 +16,70 @@ if(PAIMON_BUILD_TESTS)
1616
add_paimon_test(blob_table_inte_test
1717
STATIC_LINK_LIBS
1818
paimon_shared
19-
"-Wl,--whole-archive"
2019
${TEST_STATIC_LINK_LIBS}
21-
"-Wl,--no-whole-archive"
2220
test_utils_static
2321
${GTEST_LINK_TOOLCHAIN})
2422

2523
add_paimon_test(data_evolution_table_test
2624
STATIC_LINK_LIBS
2725
paimon_shared
28-
"-Wl,--whole-archive"
2926
${TEST_STATIC_LINK_LIBS}
30-
"-Wl,--no-whole-archive"
3127
test_utils_static
3228
${GTEST_LINK_TOOLCHAIN})
3329

3430
add_paimon_test(global_index_test
3531
STATIC_LINK_LIBS
3632
paimon_shared
37-
"-Wl,--whole-archive"
3833
${TEST_STATIC_LINK_LIBS}
39-
"-Wl,--no-whole-archive"
4034
test_utils_static
4135
${GTEST_LINK_TOOLCHAIN})
4236

4337
add_paimon_test(write_and_read_inte_test
4438
STATIC_LINK_LIBS
4539
paimon_shared
46-
"-Wl,--whole-archive"
4740
${TEST_STATIC_LINK_LIBS}
48-
"-Wl,--no-whole-archive"
4941
test_utils_static
5042
${GTEST_LINK_TOOLCHAIN})
5143

5244
add_paimon_test(clean_inte_test
5345
STATIC_LINK_LIBS
5446
paimon_shared
55-
"-Wl,--whole-archive"
5647
${TEST_STATIC_LINK_LIBS}
57-
"-Wl,--no-whole-archive"
5848
test_utils_static
5949
${GTEST_LINK_TOOLCHAIN})
6050

6151
add_paimon_test(read_inte_test
6252
STATIC_LINK_LIBS
6353
paimon_shared
64-
"-Wl,--whole-archive"
6554
${TEST_STATIC_LINK_LIBS}
66-
"-Wl,--no-whole-archive"
6755
test_utils_static
6856
${GTEST_LINK_TOOLCHAIN})
6957

7058
add_paimon_test(scan_and_read_inte_test
7159
STATIC_LINK_LIBS
7260
paimon_shared
73-
"-Wl,--whole-archive"
7461
${TEST_STATIC_LINK_LIBS}
75-
"-Wl,--no-whole-archive"
7662
test_utils_static
7763
${GTEST_LINK_TOOLCHAIN})
7864

7965
add_paimon_test(scan_inte_test
8066
STATIC_LINK_LIBS
8167
paimon_shared
82-
"-Wl,--whole-archive"
8368
${TEST_STATIC_LINK_LIBS}
84-
"-Wl,--no-whole-archive"
8569
test_utils_static
8670
${GTEST_LINK_TOOLCHAIN})
8771

8872
add_paimon_test(write_inte_test
8973
STATIC_LINK_LIBS
9074
paimon_shared
91-
"-Wl,--whole-archive"
9275
${TEST_STATIC_LINK_LIBS}
93-
"-Wl,--no-whole-archive"
9476
test_utils_static
9577
${GTEST_LINK_TOOLCHAIN})
9678

9779
add_paimon_test(read_inte_with_index_test
9880
STATIC_LINK_LIBS
9981
paimon_shared
100-
"-Wl,--whole-archive"
10182
${TEST_STATIC_LINK_LIBS}
102-
"-Wl,--no-whole-archive"
10383
test_utils_static
10484
${GTEST_LINK_TOOLCHAIN})
10585
endif()

0 commit comments

Comments
 (0)