| author | ar <ar> | 2004-10-17 11:56:29 (UTC) |
|---|---|---|
| committer | ar <ar> | 2004-10-17 11:56:29 (UTC) |
| commit | e569b68344c4b87b808b7cb8653be7e82153c5b7 (patch) (unidiff) | |
| tree | 59dc4c58f975078fc7ceec2736de5e3e20857432 /mkspecs | |
| parent | fa64fa8f5af34f2b1c792816db3f24a3416a5f6d (diff) | |
| download | opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.zip opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.tar.gz opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.tar.bz2 | |
- revert DISTCC changes
(see mailinglist and wiki for use ccache and/or distcc)
| -rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 7a12e98..7de487d 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
| @@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = UNIX | |||
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt link_prl | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = $(CCACHE) gcc | 11 | QMAKE_CC = $(CCACHE) $(DISTCC) gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| @@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC | |||
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = $(CCACHE) g++ | 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |