diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-27 10:49:50 +0000 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2024-05-23 17:05:57 +0100 |
| commit | e4859c82c7b848554b4e9d27c2f8b8615422528e (patch) | |
| tree | efad0d2400a9ef08e8af925b1dba1daba28d2813 | |
| parent | bb46b90b2ec7c8a4955ed8c5711bbc128d803b76 (diff) | |
depends: fix mingw-w64 Qt DEBUG=1 build
The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.
I'm guessing this has been broken since #24131
(01d1845a80ae48d741deea695ddce95d940ab0d8), but have not checked.
Fixes #29734.
Unblocks #29527 (now DEBUG=1 builds can be tested).
Github-Pull: #29747
Rebased-From: b7e7e727abd86104ee58beb648a94e2f453d1f6d
| -rw-r--r-- | depends/packages/qt.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 047d1d5aee..0e37deb01e 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -180,6 +180,7 @@ $(package)_config_opts_mingw32 += -xplatform win32-g++ $(package)_config_opts_mingw32 += "QMAKE_CFLAGS = '$($(package)_cflags) $($(package)_cppflags)'" $(package)_config_opts_mingw32 += "QMAKE_CXX = '$($(package)_cxx)'" $(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cxxflags) $($(package)_cppflags)'" +$(package)_config_opts_mingw32 += "QMAKE_LINK = '$($(package)_cxx)'" $(package)_config_opts_mingw32 += "QMAKE_LFLAGS = '$($(package)_ldflags)'" $(package)_config_opts_mingw32 += "QMAKE_LIB = '$($(package)_ar) rc'" $(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-" |