diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-20 21:41:57 +0200 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-20 21:46:52 +0200 |
| commit | 6c6cc7989cac79450bf83b932ca82d390a37e17b (patch) | |
| tree | 9f74542907b7d94679d839926a2d36cbacc88cbd /depends | |
| parent | bc28ca3afb7f6656a0bf50038a5e383ee7f9b219 (diff) | |
| parent | 71d33bf33f8837f80d623c8c05342388e414c46d (diff) | |
| download | bitcoin-6c6cc7989cac79450bf83b932ca82d390a37e17b.tar.xz | |
Merge bitcoin/bitcoin#25424: build, qt: Fix `QMAKE_CXXFLAGS` expression for `mingw32` host
71d33bf33f8837f80d623c8c05342388e414c46d build, qt: Fix `QMAKE_CXXFLAGS` expression for `mingw32` host (Hennadii Stepanov)
Pull request description:
A "copy-paste typo" was introduced in bitcoin/bitcoin#21593.
I'm sorry about that.
ACKs for top commit:
laanwj:
Code review ACK 71d33bf33f8837f80d623c8c05342388e414c46d
Tree-SHA512: 9433d9e51d7772d4ac1579aab75d184bb486e575ec216933b1a5171b0b68718943c96bd3669fe239b1d1ed17ec82bc5d14e777d4ff8b6fae370352864da88534
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 2bc3a81430..7e268fe9a5 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -171,7 +171,7 @@ $(package)_config_opts_mingw32 += -no-freetype $(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)_cflags) $($(package)_cppflags)'" +$(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cxxflags) $($(package)_cppflags)'" $(package)_config_opts_mingw32 += "QMAKE_LFLAGS = '$($(package)_ldflags)'" $(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-" $(package)_config_opts_mingw32 += -pch |