diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-18 12:11:10 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-18 12:11:28 +0100 |
| commit | 1baf7d1819317e4f4aeeaba2f9d72057e63b1fea (patch) | |
| tree | f7e809bb36b0e05294f716818a16d170b91f49a0 | |
| parent | 94f0749f9130ea925e2b064d9275f23269eaf24b (diff) | |
| parent | bc728d12a975934a1ef21e8d06612e157faaff6a (diff) | |
| download | bitcoin-1baf7d1819317e4f4aeeaba2f9d72057e63b1fea.tar.xz | |
Merge #17466: depends: qt: Fix C{,XX} pickup
bc728d12a975934a1ef21e8d06612e157faaff6a depends: qt: Fix C{,XX} pickup (Carl Dong)
Pull request description:
QT LOVES to do things its own way and simply ignore all environment variables. Even listing `QMAKE_CC=...` in `./configure` flags does't work reliably. This is why we gotta literally edit their config files for them. Thanks QT.
ACKs for top commit:
laanwj:
ACK bc728d12a975934a1ef21e8d06612e157faaff6a
Tree-SHA512: 3d6a0535174d70937d11b8f44ac2ab720870345a2d5a541c3e0181163ffa1988ab4f934788e9c841b646d6f53c6dc51a4fe39b294dd042c38976091c0fb96c96
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index a0f7cda2c0..6ac6ba6838 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -202,6 +202,8 @@ define $(package)_preprocess_cmds sed -i.old "s|QMAKE_CFLAGS += |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ sed -i.old "s|QMAKE_CXXFLAGS += |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ sed -i.old "0,/^QMAKE_LFLAGS_/s|^QMAKE_LFLAGS_|!host_build: QMAKE_LFLAGS = $($(package)_ldflags)\n&|" qtbase/mkspecs/win32-g++/qmake.conf && \ + sed -i.old "s|QMAKE_CC = clang|QMAKE_CC = $($(package)_cc)|" qtbase/mkspecs/common/clang.conf && \ + sed -i.old "s|QMAKE_CXX = clang++|QMAKE_CXX = $($(package)_cxx)|" qtbase/mkspecs/common/clang.conf && \ sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf endef |