From 72ebc7458dabe61c5231456d72a81ec7234a5785 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 28 Jun 2019 10:44:12 +0200 Subject: Enable ccache for non-Unix target platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the config.unix condition from the ccache feature. This enables us to use ccache for non-Unix cross-builds like MinGW on Linux. Change-Id: I3b108c2288754ad5dd05834e3d5a487c2da4ac00 Fixes: QTBUG-76681 Reviewed-by: Kai Koehne Reviewed-by: Tor Arne Vestbø --- configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.json') diff --git a/configure.json b/configure.json index c93bea46bc..525cb5a12c 100644 --- a/configure.json +++ b/configure.json @@ -1230,7 +1230,7 @@ "ccache": { "label": "Using ccache", "autoDetect": false, - "condition": "config.unix && tests.ccache", + "condition": "tests.ccache", "output": [ "privateConfig" ] }, "msvc_mp": { -- cgit v1.2.3 From d9fb502b20129ef975cc6e20df306dcd84c64142 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 9 Jul 2019 14:59:00 +0200 Subject: 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 --- configure.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.json') diff --git a/configure.json b/configure.json index 525cb5a12c..7279259484 100644 --- a/configure.json +++ b/configure.json @@ -233,12 +233,14 @@ "label": "target architecture", "type": "architecture", "test": "arch", + "output": "arch", "log": "arch" }, "host_architecture": { "label": "host architecture", "type": "architecture", "test": "arch", + "output": "arch_host", "host": true, "pro": "arch_host.pro", "log": "arch" -- cgit v1.2.3