Skip to content

Commit de28c34

Browse files
committed
Merge bitcoin#22814: build: Add ability to build qt in depends with -stdlib=libc++
33796a9 build: Add ability to build qt in depends with -stdlib=libc++ (Hennadii Stepanov) Pull request description: This PR makes possible to build the `qt` package in depends against `libc++` for x86_64 platform. Fixes bitcoin#22344. Required for bitcoin#22815. Also this PR [fixes](bitcoin#23060 (comment)) the `[no wallet] [bionic]` task on CI: - on master (a8bbd4c), https://api.cirrus-ci.com/v1/task/5558609250615296/logs/ci.log: ``` Options used to compile and link: external signer = yes multiprocess = no with libs = yes with wallet = no with gui / qt = no ``` - this PR, https://api.cirrus-ci.com/v1/task/5502605561430016/logs/ci.log: ``` Options used to compile and link: external signer = yes multiprocess = no with libs = yes with wallet = no with gui / qt = yes ``` ACKs for top commit: fanquake: ACK 33796a9 - While this sort of string matching is fragile, I think the risk of this causing any actual issues is low. Tree-SHA512: 586dde2e9864cec7a49aeb4f2b77fb8c4ae96bd10b51f9c6de0cfe8512ad61db15bb7f8d1b0eb6a5a66fd2deee52ac52218f01eb6be107ac12f1a956190de54b
2 parents 3c40355 + 33796a9 commit de28c34

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

depends/packages/qt.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,11 @@ $(package)_config_opts_linux += -no-feature-vulkan
147147
$(package)_config_opts_linux += -dbus-runtime
148148
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
149149
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
150+
ifneq (,$(findstring -stdlib=libc++,$($(1)_cxx)))
151+
$(package)_config_opts_x86_64_linux = -xplatform linux-clang-libc++
152+
else
150153
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
154+
endif
151155
$(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
152156
$(package)_config_opts_powerpc64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
153157
$(package)_config_opts_powerpc64le_linux = -platform linux-g++ -xplatform bitcoin-linux-g++

0 commit comments

Comments
 (0)