1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 11 May 2015 13:47:06 +0300
Subject: [PATCH] Generate usable qmake_extras.gypi
Running qmake recursively does not take .depends into account, so
the SUBDIRS need to be in correct order so that qmake_extras.gypi
is used for the ninja files. Do no try to write compiler tools as
it will break the build.
Task-number: QTBUG-45706
Upstream-Status: Pending
---
src/core/core.pro | 7 ++++---
src/core/gyp_configure_host.pro | 3 ---
src/core/gyp_configure_target.pro | 3 ---
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/core/core.pro b/src/core/core.pro
index cf00f39..747b711 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -12,9 +12,7 @@ gyp_run.depends = core_gyp_generator
core_module.file = core_module.pro
core_module.depends = gyp_run
-SUBDIRS += core_gyp_generator \
- gyp_run \
- core_module
+SUBDIRS += core_gyp_generator
!win32 {
# gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that
@@ -28,3 +26,6 @@ SUBDIRS += core_gyp_generator \
gyp_run.depends += gyp_configure_host gyp_configure_target
SUBDIRS += gyp_configure_host gyp_configure_target
}
+
+SUBDIRS += gyp_run \
+ core_module
diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
index 3eb6738..d6820c4 100644
--- a/src/core/gyp_configure_host.pro
+++ b/src/core/gyp_configure_host.pro
@@ -6,9 +6,6 @@ option(host_build)
GYPI_CONTENTS = "{" \
" 'make_global_settings': [" \
- " ['CC.host', '$$which($$QMAKE_CC)']," \
- " ['CXX.host', '$$which($$QMAKE_CXX)']," \
- " ['LD.host', '$$which($$QMAKE_LINK)'],"
GYPI_FILE = $$absolute_path('qmake_extras.gypi')
!build_pass {
diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro
index 4d52044..f02bfa0 100644
--- a/src/core/gyp_configure_target.pro
+++ b/src/core/gyp_configure_target.pro
@@ -3,9 +3,6 @@ TEMPLATE = aux
TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR}
-GYPI_CONTENTS += " ['CC', '$$which($$QMAKE_CC)']," \
- " ['CXX', '$$which($$QMAKE_CXX)']," \
- " ['LD', '$$which($$QMAKE_LINK)'],"
GYPI_CONTENTS += " ]," \
" 'target_defaults': {" \
" 'target_conditions': [" \
--
1.9.1
|
