summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri53
1 files changed, 11 insertions, 42 deletions
diff --git a/configure.pri b/configure.pri
index 7b8dee0953..ecd46b8e38 100644
--- a/configure.pri
+++ b/configure.pri
@@ -286,37 +286,13 @@ defineTest(qtConfTest_architecture) {
!qtConfTest_compile($${1}): \
error("Could not determine $$eval($${1}.label). See config.log for details.")
- host = $$eval($${1}.host)
- isEmpty(host): host = false
- file_prefix =
- exts = -
- $$host {
- equals(QMAKE_HOST.os, Windows): \
- exts = .exe
- } else {
- win32 {
- exts = .exe
- } else:android {
- file_prefix = lib
- exts = .so
- } else:wasm {
- exts = .wasm .o
- }
- }
-
test = $$eval($${1}.test)
output = $$eval($${1}.output)
test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)/$$test
- test_out_file =
- for(ext, exts) {
- equals(ext, -): ext =
- f = $$test_out_dir/$$file_prefix$$output$$ext
- exists($$f) {
- test_out_file = $$f
- break()
- }
- }
- isEmpty(test_out_file): \
+ test_out_file = $$test_out_dir/$$cat($$test_out_dir/$${output}.target.txt)
+ exists($$test_out_file): \
+ content = $$cat($$test_out_file, blob)
+ else: \
error("$$eval($${1}.label) detection binary not found.")
content = $$cat($$test_out_file, blob)
@@ -597,14 +573,7 @@ defineTest(qtConfOutput_prepareOptions) {
qtConfFatalError("Cannot find Android NDK." \
"Please use -android-ndk option to specify one.")
- ndk_tc_ver = $$eval(config.input.android-toolchain-version)
- isEmpty(ndk_tc_ver): \
- ndk_tc_ver = 4.9
- !exists($$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt/*): \
- qtConfFatalError("Cannot detect Android NDK toolchain." \
- "Please use -android-toolchain-version to specify it.")
-
- ndk_tc_pfx = $$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt
+ ndk_tc_pfx = $$ndk_root/toolchains/llvm/prebuilt
ndk_host = $$eval(config.input.android-ndk-host)
isEmpty(ndk_host): \
ndk_host = $$getenv(ANDROID_NDK_HOST)
@@ -642,10 +611,11 @@ defineTest(qtConfOutput_prepareOptions) {
qtConfFatalError("Specified Android NDK host is invalid.")
}
- target_arch = $$eval(config.input.android-arch)
- isEmpty(target_arch): \
- target_arch = armeabi-v7a
-
+ android_abis = $$eval(config.input.android-abis)
+ isEmpty(android_abis): \
+ android_abis = $$eval(config.input.android-arch)
+ isEmpty(android_abis): \
+ android_abis = armeabi-v7a,arm64-v8a,x86,x86_64
platform = $$eval(config.input.android-ndk-platform)
isEmpty(platform): \
platform = android-21
@@ -655,8 +625,7 @@ defineTest(qtConfOutput_prepareOptions) {
"DEFAULT_ANDROID_NDK_ROOT = $$val_escape(ndk_root)" \
"DEFAULT_ANDROID_PLATFORM = $$platform" \
"DEFAULT_ANDROID_NDK_HOST = $$ndk_host" \
- "DEFAULT_ANDROID_TARGET_ARCH = $$target_arch" \
- "DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION = $$ndk_tc_ver"
+ "DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')"
}
export($${currentConfig}.output.devicePro)