diff options
| author | Carl Dong <contact@carldong.me> | 2019-09-16 12:53:52 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2019-09-16 12:58:24 -0400 |
| commit | 1b4030e26450b0f9320d64714d8e8dee37b050d2 (patch) | |
| tree | 76e8118d187248468b816a17d1a35731038d0d58 | |
| parent | 6eb12ffcbdca53fac304d8fedcfc69effab63b0d (diff) | |
depends: qt: Fix LDFLAGS pickup
QMAKE_LFLAGS was removed from qtbase/mkspecs/win32-g++/qmake.conf in
39fc377bf105ba09e2a8f9acae467dc789b96525. Here, we add it back in with
our LDFLAGS from depends before the first occurance of any
QMAKE_LFLAGS_* variable settings.
| -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 83e1b10a31..7e729c2da0 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -179,8 +179,8 @@ define $(package)_preprocess_cmds 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_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 "0,/^QMAKE_LFLAGS_/s|^QMAKE_LFLAGS_|!host_build: QMAKE_LFLAGS = $($(package)_ldflags)\n&|" qtbase/mkspecs/win32-g++/qmake.conf && \ sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf endef |