diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-05-23 17:59:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 19:27:41 +0200 |
commit | a6bd4c60e4d9e3a9704f2dbd91b3d79018c044b0 (patch) | |
tree | b6c83aad33fd23edd912841c5807b171e9a3eec7 /mkspecs | |
parent | cd8ff4fa8f19ebd4a4048e7c55b386d66a835ee9 (diff) |
devices: Allow to pick up the compiler from the path
Re-enable checking if the compiler is in the path. The previous
commit dealt with a user/spec author not setting CROSS_COMPILE and
then picking up the host g++. Re-add the 'which' check, but put it
after the sanity check for the CROSS_COMPILE variable. This check
assumes that QMAKE_CXX is of the form "${CROSS_COMPILE}g++".
Change-Id: I54f7e058a75d26d73eca5a860946a6854ce91d67
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/device_config.prf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index b8991bbe45..ccf13b5166 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -32,14 +32,19 @@ unset(DIR) # Provide a function to be used by mkspecs defineTest(deviceSanityCheckCompiler) { - # Check if the binary exists with an absolute path + # Check if the binary exists with an absolute path. Do this check + # before the CROSS_COMPILE empty check below to allow the mkspec + # to derive the compiler path from other device options. exists($$QMAKE_CXX):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>") - # CROSS_COMPILE is an incorrect path + # Check if QMAKE_CXX points to an executable. + system("which $$QMAKE_CXX > /dev/null"):return() + + # QMAKE_CXX does not point to a compiler. error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option") } |