summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-08-02 09:24:37 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-08-08 14:26:11 +0200
commit39e937a538325c4fc40a790496f2a39d28f8eba4 (patch)
tree29dd7bf03d1f5589ccb0c09aad28c1dd07d75065 /configure.pri
parentaef0fba3c550915318db5b350892f558ec7e77ff (diff)
Fix host architecture detection for canadian cross builds
If the host architecture is different from -platform (canadian cross build with -external-hostbindir) then we cannot use QMAKE_HOST.os to deduce the executable extension for that platform, because this value comes from the qmake binary that was pointed to by -external-hostbindir. Move the target name deduction mechanism to the actual configure test .pro files to make sure the right scopes are available, and write the deduced target name to a text file. That text file is read by qtConfTest_architecture to get the right binary to analyze. Fixes: QTBUG-77286 Change-Id: I68b844dd51dbfda6432a4b0dca6331899c82255f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri20
1 files changed, 1 insertions, 19 deletions
diff --git a/configure.pri b/configure.pri
index e9fd055854..09c34af4ee 100644
--- a/configure.pri
+++ b/configure.pri
@@ -266,28 +266,10 @@ 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 =
- ext =
- $$host {
- equals(QMAKE_HOST.os, Windows): \
- ext = .exe
- } else {
- win32 {
- ext = .exe
- } else:android {
- file_prefix = lib
- ext = .so
- } else:wasm {
- ext = .wasm
- }
- }
-
test = $$eval($${1}.test)
output = $$eval($${1}.output)
test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)/$$test
- test_out_file = $$test_out_dir/$$file_prefix$$output$$ext
+ test_out_file = $$test_out_dir/$$cat($$test_out_dir/$${output}.target.txt)
exists($$test_out_file): \
content = $$cat($$test_out_file, blob)
else: \