Skip to content

Commit 6c6cc79

Browse files
committed
Merge bitcoin/bitcoin#25424: build, qt: Fix QMAKE_CXXFLAGS expression for mingw32 host
71d33bf 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 71d33bf Tree-SHA512: 9433d9e51d7772d4ac1579aab75d184bb486e575ec216933b1a5171b0b68718943c96bd3669fe239b1d1ed17ec82bc5d14e777d4ff8b6fae370352864da88534
2 parents bc28ca3 + 71d33bf commit 6c6cc79

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ $(package)_config_opts_mingw32 += -no-freetype
171171
$(package)_config_opts_mingw32 += -xplatform win32-g++
172172
$(package)_config_opts_mingw32 += "QMAKE_CFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
173173
$(package)_config_opts_mingw32 += "QMAKE_CXX = '$($(package)_cxx)'"
174-
$(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
174+
$(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cxxflags) $($(package)_cppflags)'"
175175
$(package)_config_opts_mingw32 += "QMAKE_LFLAGS = '$($(package)_ldflags)'"
176176
$(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
177177
$(package)_config_opts_mingw32 += -pch

0 commit comments

Comments
 (0)