summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2019-11-12 17:06:57 +0100
committerMitch Curtis <mitch.curtis@qt.io>2019-11-13 12:39:10 +0100
commit491005395b08660ff12a167b57a2d76e26917145 (patch)
tree6cdb7ccdd97f2b74dfcaa34f35b2c5b17fa3baa8
parent6961d46b6e07fc9492c31e5bd8b98660fd65e4e6 (diff)
configure.pri: improve error message when Android NDK host is invalid
Old: ERROR: Specified Android NDK host is invalid. New: ERROR: Specified Android NDK host 'windows-x86_64' is invalid. Expected files in the following directory to exist: /foo/bar/toolchains/llvm/prebuilt/windows-x86_64/ Change-Id: Idd964cc0eeedfbd984b13dc9289830e6be766326 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--configure.pri7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri
index 97b9f3bf63..2b8d20d607 100644
--- a/configure.pri
+++ b/configure.pri
@@ -607,8 +607,11 @@ defineTest(qtConfOutput_prepareOptions) {
qtConfAddNote("Available Android host does not match host architecture.")
}
} else {
- !exists($$ndk_tc_pfx/$$ndk_host/*): \
- qtConfFatalError("Specified Android NDK host is invalid.")
+ !exists($$ndk_tc_pfx/$$ndk_host/*) {
+ err = "Specified Android NDK host '$$ndk_host' is invalid. Expected files in the following directory to exist:"
+ err += '$${ndk_tc_pfx}/$${ndk_host}/'
+ qtConfFatalError($$err)
+ }
}
android_abis = $$eval(config.input.android-abis)