aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2023-03-23 14:06:23 +0000
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2023-03-23 14:38:02 +0000
commit25e8fe70c6e65c07cf602568f5c2cf5535fca995 (patch)
treecfd4ce26646eaeb5bcb30d6fd022f79b23e178ec /depends
parentf380bb93e854b24cec4ef020235340f5186deded (diff)
downloadbitcoin-25e8fe70c6e65c07cf602568f5c2cf5535fca995.tar.xz
build, qt: Fix handling of `CXX=clang++` when building `qt` package
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/qt.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 2f7ddf6a5f..136ce32579 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -161,9 +161,15 @@ $(package)_config_opts_linux += -dbus-runtime
ifneq ($(LTO),)
$(package)_config_opts_linux += -ltcg
endif
-$(package)_config_opts_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
-ifneq (,$(findstring -stdlib=libc++,$($(1)_cxx)))
-$(package)_config_opts_x86_64_linux = -xplatform linux-clang-libc++
+
+ifneq (,$(findstring clang,$($(package)_cxx)))
+ ifneq (,$(findstring -stdlib=libc++,$($(package)_cxx)))
+ $(package)_config_opts_linux += -platform linux-clang-libc++ -xplatform linux-clang-libc++
+ else
+ $(package)_config_opts_linux += -platform linux-clang -xplatform linux-clang
+ endif
+else
+ $(package)_config_opts_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
endif
$(package)_config_opts_mingw32 = -no-opengl