diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-09 13:21:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:05:50 +0000 |
| commit | 3444e23652f69a0d61512b2d50874b125fdd4c8a (patch) | |
| tree | a18b0f8edd47d2f7a35f52a585c654a758943f98 /mkspecs/features/device_config.prf | |
| parent | a989e5c54fd2f97bd3fd9b9da9d2b677c64c7ea8 (diff) | |
make QMAKE_CXX/CROSS_COMPILE verification work under windows
automatically append the .exe extension. this is done unconditionally,
which means that providing it in the spec is wrong by definition.
don't use system("which") (which won't do what we want in a windows
shell), but scan PATH ourselves. as a bonus, this is also faster.
to avoid fetching and splitting the path multiple times, factor out a
function in spec_pre.prf.
Change-Id: I95f0fa285c158b347d45422111f91540e3a595fd
Reviewed-by: Jochen Seemann <seemann.jochen@gmail.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
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") |