diff options
| author | Carl Dong <contact@carldong.me> | 2019-09-09 15:12:40 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2019-09-09 15:12:40 -0400 |
| commit | 6eb12ffcbdca53fac304d8fedcfc69effab63b0d (patch) | |
| tree | 0a9e35ceb2d8c4fa41a2b31203f9c7da4ee671c9 /depends/packages | |
| parent | 8af835a72d15d19e98ce22d21903cc0d080d3b92 (diff) | |
depends: qt: Fix C{,XX}FLAGS pickup
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/qt.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 2610c1e748..83e1b10a31 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -178,9 +178,9 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/no-xlib.patch &&\ echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ - 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_CFLAGS += |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ sed -i.old "s|QMAKE_LFLAGS = |!host_build: QMAKE_LFLAGS = $($(package)_ldflags) |" 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 "s|QMAKE_CXXFLAGS += |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf endef |