diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-09 14:59:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-09 22:53:48 +0200 |
| commit | d9fb502b20129ef975cc6e20df306dcd84c64142 (patch) | |
| tree | 24375f76321b18561d99295e8dacd0aafbe7a722 /config.tests/arch | |
| parent | 89984a8a61a7e33a4ff62db98083a0e3c0c7b4b1 (diff) | |
Fix android architecture detection
Android is also unix, so can pick up the host 'arch' binary when
rerunning configure. This patch splits the names so we don't end up
confusing target and host binaries.
Task-number: QTBUG-76445
Change-Id: Ib65251a514e45ad8873f523d71c17e13e56ea58a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'config.tests/arch')
| -rw-r--r-- | config.tests/arch/arch.pro | 1 | ||||
| -rw-r--r-- | config.tests/arch/arch_host.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro index 2ffdb2c889..45a7eb33af 100644 --- a/config.tests/arch/arch.pro +++ b/config.tests/arch/arch.pro @@ -1,2 +1 @@ -TARGET = arch SOURCES = arch.cpp diff --git a/config.tests/arch/arch_host.pro b/config.tests/arch/arch_host.pro index f7acef0c5d..cefdbc77ef 100644 --- a/config.tests/arch/arch_host.pro +++ b/config.tests/arch/arch_host.pro @@ -1,2 +1,2 @@ option(host_build) -include(arch.pro) +SOURCES = arch.cpp |