diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-29 09:35:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-29 10:55:33 +0100 |
| commit | 4b491334cf3739ab9df9278c27ac57cfe9bd655d (patch) | |
| tree | 8e208ecad8ece0a5d8ba7bea1936fbd0bb973c05 /mkspecs | |
| parent | 7ebc151bcfe71dc837ce9fb2d4c71b7cba7bb7f0 (diff) | |
| parent | 8613b64f535b0ce05adf6f4708ba0826f22a7eb4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 05e10c9641..6b37a04450 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,4 +1,7 @@ -equals(MAKEFILE_GENERATOR, UNIX) { +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) { !equals(QMAKE_HOST.os, Windows): \ |