From b41028aaf37031b2d84b6e952e209807b6785bea Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Fri, 18 May 2012 11:37:43 -0700 Subject: 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 --- mkspecs/features/device_config.prf | 10 ++++++---- 1 file 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=") - 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") } -- cgit v1.2.3