diff options
Diffstat (limited to 'mkspecs/features/device_config.prf')
| -rw-r--r-- | mkspecs/features/device_config.prf | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index 1de64b8821..cd3a0cf8cd 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -14,17 +14,26 @@ host_build { # Provide a function to be used by mkspecs defineTest(deviceSanityCheckCompiler) { + equals(QMAKE_HOST.os, Windows): \ + sfx = .exe + else: \ + sfx = + # 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() + exists($$QMAKE_CXX$$sfx):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>") # Check if QMAKE_CXX points to an executable. - system("which $$QMAKE_CXX > /dev/null"):return() + ensurePathEnv() + for (dir, QMAKE_PATH_ENV) { + exists($$dir/$${QMAKE_CXX}$$sfx): \ + return() + } # QMAKE_CXX does not point to a compiler. error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option") |