diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-17 14:07:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-17 12:15:33 +0000 |
| commit | 74910e2192ff78941f7010b1c8f165c3013ff116 (patch) | |
| tree | d971fbe2fe1531febf306749b96b69fc0523b135 /mkspecs/features/configure.prf | |
| parent | 8714c99f65381af194cc4991c4258fec4b9a6307 (diff) | |
Fix running of configure tests when cross compiling on Windows
When compiling on Windows to for example Android, we may be using the unix
generator, but the make command may be mingw32-make.
Task-number: QTBUG-53038
Change-Id: If8d1e1bea733cf1b4ed837c423a34ecfb3cafd1f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/configure.prf')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 6b37a04450..2cb2981758 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,9 +1,7 @@ QMAKE_MAKE = $$(MAKE) !isEmpty(QMAKE_MAKE) { # We were called recursively. Use the right make, as MAKEFLAGS may be set as well. -} else:equals(MAKEFILE_GENERATOR, UNIX) { - QMAKE_MAKE = make -} else:equals(MAKEFILE_GENERATOR, MINGW) { +} else:if(equals(MAKEFILE_GENERATOR, UNIX)|equals(MAKEFILE_GENERATOR, MINGW)) { !equals(QMAKE_HOST.os, Windows): \ QMAKE_MAKE = make else: \ |