From 491005395b08660ff12a167b57a2d76e26917145 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Tue, 12 Nov 2019 17:06:57 +0100
Subject: [PATCH] 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>
---
 configure.pri | 7 +++++--
 1 file 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)