author | mickeyl <mickeyl> | 2003-12-07 15:14:59 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 15:14:59 (UTC) |
commit | d4f47b47a8d0b64daca4becf9169dee70c629bab (patch) (unidiff) | |
tree | 6c246e95a79ac468fc107aaf9f0904e4a4d40f27 | |
parent | 4518f62746143246d29eb9f08030e241ac33eeb7 (diff) | |
download | opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.zip opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.tar.gz opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.tar.bz2 |
allow the use of ccache and distcc (if available) for the x86 build
-rw-r--r-- | Vars.make | 4 | ||||
-rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -118,4 +118,8 @@ ifeq ($(STRIP),) | |||
118 | ifneq ($(CONFIG_TARGET_YOPY),) | 118 | ifneq ($(CONFIG_TARGET_YOPY),) |
119 | STRIP=arm-linux-strip | 119 | STRIP=arm-linux-strip |
120 | endif | 120 | endif |
121 | endif | 121 | endif |
122 | |||
123 | export CCACHE=$(shell which ccache 2>/dev/null) | ||
124 | export DISTCC=$(shell which distcc 2>/dev/null) | ||
125 | |||
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 40af4ad..2610b12 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
@@ -7,9 +7,9 @@ | |||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
10 | 10 | ||
11 | QMAKE_CC = 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 |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
@@ -21,9 +21,9 @@ QMAKE_CFLAGS_DEBUG = -g | |||
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | 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 = 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 |
29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |