AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.pri: improve error message when Android NDK host is invalid

Browse Source 
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>
This commit is contained in:
Mitch Curtis 2019-11-12 17:06:57 +01:00
parent 6961d46b6e
commit 491005395b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.pri
View File

@ -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)