From 99e5496ff7abc6bf1436783e951231ffd9a83ca0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 19 Dec 2012 23:44:05 +0100 Subject: fix QMAKE_MAKE for qtCompileTest for cross building modules Cross bulding on unix for mingw exploits the fact that makefiles generated for mingw work with plain make. There is no mingw32-make, so this is the only option. Arguably, plain make could also be used in an MSYS environment, perhaps detected by MINGW_IN_SHELL, but there might be good reasons I don't know about not to do this. Change-Id: I694c74046a307c2887af1c30cca36f95e242adc1 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/configure.prf | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index ff52c6b373..39144e7216 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,11 +1,15 @@ -equals(MAKEFILE_GENERATOR, UNIX): \ +equals(MAKEFILE_GENERATOR, UNIX) { QMAKE_MAKE = make -else:equals(MAKEFILE_GENERATOR, MINGW): \ - QMAKE_MAKE = mingw32-make -else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)): \ +} else:equals(MAKEFILE_GENERATOR, MINGW) { + !equals(QMAKE_HOST.os, Windows): \ + QMAKE_MAKE = make + else: \ + QMAKE_MAKE = mingw32-make +} else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) { QMAKE_MAKE = nmake -else: \ +} else { error("Configure tests are not supported with the $$MAKEFILE_GENERATOR Makefile generator.") +} # Ensure that a cache is present. If none was found on startup, this will create # one in the build directory of the project which loads this feature. -- cgit v1.2.3