summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-11-23 20:11:17 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-13 18:55:52 +0000
commite58eb3d6f953c224c2d47cd344bc41ba9f499223 (patch)
treef7f8db1514ad1b8a1e374af9d84850591a913a6b /config.tests
parente2eab15e34181d81bac26613ab72c03240402bf8 (diff)
move device spec validation to configure
instead of letting the specs validate themselves on each call, let them only define a callback for use by the verifyspec configure test. this is somewhat faster, and allows them to be loaded before qdevice.pri is populated. Change-Id: I2b60d006b33bbf42c28949f10ad429520ed32f46 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/common/verifyspec/verifyspec.pro36
1 files changed, 36 insertions, 0 deletions
diff --git a/config.tests/common/verifyspec/verifyspec.pro b/config.tests/common/verifyspec/verifyspec.pro
index d78ed2985a..11a280e4ce 100644
--- a/config.tests/common/verifyspec/verifyspec.pro
+++ b/config.tests/common/verifyspec/verifyspec.pro
@@ -1 +1,37 @@
SOURCES = verifyspec.cpp
+
+# Provide a function to be used by mkspecs
+defineTest(deviceSanityCheckCompiler) {
+ equals(QMAKE_HOST.os, Windows): \
+ sfx = .exe
+ else: \
+ sfx =
+
+ # Build the compiler filename using the first value in QMAKE_CXX in order to
+ # support tools like ccache, which give QMAKE_CXX values of the form:
+ # ccache <path_to_compiler>
+ compiler = $$first(QMAKE_CXX)$$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($$compiler): 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.
+ ensurePathEnv()
+ for (dir, QMAKE_PATH_ENV) {
+ exists($$dir/$${compiler}): \
+ return()
+ }
+
+ # QMAKE_CXX does not point to a compiler.
+ error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option")
+}
+
+defined(qtConfSanitizeMkspec, test): \
+ qtConfSanitizeMkspec()