Skip to content

Commit fe51145

Browse files
committed
Merge bitcoin/bitcoin#22174: build, qt: Fix libraries linking order for Linux hosts
a8bd5ea build, qt: Fix libraries linking order for Linux hosts (Hennadii Stepanov) Pull request description: `-lxcb-shm` should follow `-lxcb` when linking libraries for Linux hosts. Fixes #22105. ACKs for top commit: prayank23: ACK bitcoin/bitcoin@a8bd5ea fanquake: ACK a8bd5ea Tree-SHA512: 6ea2a1ba5440dd01e64428e5c3aa3e7a6e1380b723071ad38a0516b23b56dc252cb2a6544e014b13a0b2f89b3fe45c04a82e498669b5cc74a5f9b70d9c270926
2 parents 68a89d7 + a8bd5ea commit fe51145

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
150150
AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
151151
elif test "x$TARGET_OS" = xlinux; then
152152
dnl workaround for https://bugreports.qt.io/browse/QTBUG-74874
153-
AX_CHECK_LINK_FLAG([-lxcb-shm], [QT_LIBS="-lxcb-shm $QT_LIBS"], [AC_MSG_ERROR([could not link against -lxcb-shm])])
153+
AX_CHECK_LINK_FLAG([-lxcb-shm], [QT_LIBS="$QT_LIBS -lxcb-shm"], [AC_MSG_ERROR([could not link against -lxcb-shm])])
154154
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb])
155155
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
156156
elif test "x$TARGET_OS" = xdarwin; then

0 commit comments

Comments
 (0)