From d3d8ac354665687bd7c96e3f4b3c8b7e0d9c3172 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 8 Mar 2013 22:23:30 +0100
Subject: don't bootstrap tools when not necessary

bootstrapping is only necessary if we are cross-compiling or have a
circular build dependency.

Change-Id: I17244457652ca9d4fc797043e57070c2ae3ee5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt_build_config.prf | 3 +++
 mkspecs/features/qt_tool.prf         | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 4f5b62e1e5..c53bc960a2 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -39,6 +39,9 @@ mac {
    }
 }
 
+cross_compile: \
+    CONFIG += force_bootstrap
+
 CONFIG += \
     create_prl link_prl \
     prepare_docs qt_docs_targets \
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
index a49b3f25db..56ba1169a1 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -17,9 +17,9 @@ DESTDIR = $$MODULE_BASE_OUTDIR/bin
 CONFIG += console
 isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
 
-host_build {
+host_build: QT -= gui   # no host tool will ever use gui
+host_build:force_bootstrap {
     !build_pass: CONFIG += release
-    QT -= gui   # no host tool will ever use gui
     contains(QT, core(-private)?|xml) {
         QT -= core core-private xml
         QT += bootstrap-private
@@ -36,7 +36,8 @@ load(qt_common)
 
 # If we are doing a prefix build, create a "module" pri which enables
 # qtPrepareTool() to work with the non-installed build.
-!build_pass:prefix_build {
+# Non-bootstrapped tools always need this because of the environment setup.
+!build_pass:if(!host_build|!force_bootstrap|prefix_build) {
 
     isEmpty(MODULE):MODULE = $$TARGET
 
@@ -46,7 +47,7 @@ load(qt_common)
 
     load(resolve_target)
     cmd = $$shell_path($$QMAKE_RESOLVED_TARGET)
-    !host_build: qtAddTargetEnv(cmd)
+    !host_build|!force_bootstrap: qtAddTargetEnv(cmd)
 
     TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri
 
-- 
cgit v1.2.3