summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-08-25 11:38:18 +0200
committerZeno Albisser <zeno.albisser@digia.com>2014-08-26 21:58:37 +0200
commitc913484414415685e20d04b73cabda0cb0b83205 (patch)
tree4ba6a389ea1d969ed03de7ae3da279e909b38728 /tools
parent085aa0d44337e468595b74dd691c29a41d7a4f56 (diff)
[Win64] Make sure ninja is built in 64bit mode as well.
Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/functions.prf6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 88a5aad7a..44ed4f9e6 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -113,7 +113,11 @@ defineReplace(findOrBuildNinja) {
# If we did not find ninja, then we bootstrap it.
!exists($$out) {
- system("python $$dirname(out)/bootstrap.py")
+ contains(DEFINES, WIN64) {
+ system("python $$dirname(out)/bootstrap.py --x64")
+ } else {
+ system("python $$dirname(out)/bootstrap.py")
+ }
}
return($$out)
}