From cba4a7e4164aa86b00b0f01beaba4be57ae21790 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 12 Mar 2021 12:51:18 +0200 Subject: build, qt: Always test plugins/subdir before adding to search paths The existence of each subdir is not guaranteed for all platforms. --- build-aux/m4/bitcoin_qt.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'build-aux/m4/bitcoin_qt.m4') diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 1fd88db08f..5b3a3259c9 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -123,7 +123,12 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ _BITCOIN_QT_CHECK_STATIC_LIBS if test "x$qt_plugin_path" != x; then - QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms -L$qt_plugin_path/styles" + if test -d "$qt_plugin_path/platforms"; then + QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms" + fi + if test -d "$qt_plugin_path/styles"; then + QT_LIBS="$QT_LIBS -L$qt_plugin_path/styles" + fi if test -d "$qt_plugin_path/accessible"; then QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible" fi -- cgit v1.2.3