Skip to content

Commit f8302cd

Browse files
committed
apply static test linkage to ODBC only
1 parent 3e28812 commit f8302cd

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,6 @@ services:
516516
ARROW_PARQUET: "OFF"
517517
ARROW_S3: "OFF"
518518
ARROW_SUBSTRAIT: "OFF"
519-
# GH-49651 Link ODBC tests statically on Linux to fix segfault
520-
ARROW_TEST_LINKAGE: "static"
521519
# Register ODBC before running tests
522520
command: >
523521
/bin/bash -c "

cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
4242
# GH-46889: move protobuf_test_util to a more common location
4343
../../../../engine/substrait/protobuf_test_util.cc)
4444

45-
# GH-49652: TODO support static test linkage on macOS
46-
if(ARROW_TEST_LINKAGE STREQUAL "static")
47-
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
48-
${ARROW_TEST_STATIC_LINK_LIBS})
49-
else()
45+
# GH-49651 Link ODBC tests statically on Linux and dynamically on macOS/Windows
46+
if(WIN32 OR APPLE)
5047
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_shared
5148
${ARROW_TEST_SHARED_LINK_LIBS})
49+
else()
50+
# GH-49651 Link ODBC tests statically on Linux to fix segfault
51+
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
52+
${ARROW_TEST_STATIC_LINK_LIBS})
5253
endif()
5354

5455
# On macOS, link `ODBCINST` first to ensure iodbc take precedence over unixodbc

0 commit comments

Comments
 (0)