diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-05-18 11:37:43 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 00:41:35 +0200 |
| commit | b41028aaf37031b2d84b6e952e209807b6785bea (patch) | |
| tree | 15c89306da025175c985b7600f3c8d4d21f30e22 /mkspecs/features/device_config.prf | |
| parent | 30cf695e7a3fabe1c86e088e9fb08127ae00ee68 (diff) | |
device: Check CROSS_COMPILE in deviceSanityCheckCompiler
QMAKE_CXX is initialized by default to gcc. As a result,
'which $QMAKE_CXX' always succeeds.
This change removes the 'which' check and makes it explicit
that CROSS_COMPILE is a mandatory option to -device mkspecs.
Change-Id: Icefa9d14fc24086a60c9108ff7d9d16fd9990995
Done-with: Johannes Zellner
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features/device_config.prf')
| -rw-r--r-- | mkspecs/features/device_config.prf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index 020b3ad7bb..b8991bbe45 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -32,12 +32,14 @@ unset(DIR) # Provide a function to be used by mkspecs defineTest(deviceSanityCheckCompiler) { - # Check if the binary exists, e.g. with an absolute path + # Check if the binary exists with an absolute path exists($$QMAKE_CXX):return() - # Check if the compiler is in the path - system("which $$QMAKE_CXX > /dev/null"):return() + # Check for possible reasons of failure + # check if CROSS_COMPILE device-option is set + isEmpty(CROSS_COMPILE):error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=<path>") - error("Compiler $$QMAKE_CXX not found") + # CROSS_COMPILE is an incorrect path + error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option") } |