File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed
cpp/src/arrow/flight/sql/odbc/tests Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff 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 "
Original file line number Diff line number Diff 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} )
5253endif ()
5354
5455# On macOS, link `ODBCINST` first to ensure iodbc take precedence over unixodbc
You can’t perform that action at this time.
0 commit comments