diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-04 15:01:49 +0100 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-04 15:28:57 +0100 |
| commit | 030b19f36e82cc005d21fab56e26c8b76c811ae7 (patch) | |
| tree | 26558f5f03ffeb88c8dd50defeef322956c2ba31 /tools | |
| parent | 135710b1fa38f72a934c542d196af9eff066d908 (diff) | |
| download | qt4-tools-030b19f36e82cc005d21fab56e26c8b76c811ae7.tar.gz | |
Add src/tools/tools.pro, and use when building host tools for xcompiling
Configure.exe would simply initiate a build for each of the tools in
order. However, this would break certain distributed build systems,
since they would return right away after initiating the make. Thus,
sometimes moc et al. would try to link before bootstrap lib was built.
Reviewed-by: Jason McDonald
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f75b51b77a..5e11534f69 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3379,10 +3379,7 @@ void Configure::buildHostTools() QString pwd = QDir::currentPath(); QStringList hostToolsDirs; hostToolsDirs - << "src/tools/bootstrap" - << "src/tools/moc" - << "src/tools/rcc" - << "src/tools/uic"; + << "src/tools"; if(dictionary["XQMAKESPEC"].startsWith("wince")) hostToolsDirs << "tools/checksdk"; |