summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-07 15:14:59 (UTC)
committer mickeyl <mickeyl>2003-12-07 15:14:59 (UTC)
commitd4f47b47a8d0b64daca4becf9169dee70c629bab (patch) (side-by-side diff)
tree6c246e95a79ac468fc107aaf9f0904e4a4d40f27
parent4518f62746143246d29eb9f08030e241ac33eeb7 (diff)
downloadopie-d4f47b47a8d0b64daca4becf9169dee70c629bab.zip
opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.tar.gz
opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.tar.bz2
allow the use of ccache and distcc (if available) for the x86 build
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Vars.make4
-rw-r--r--mkspecs/qws/linux-generic-g++/qmake.conf4
2 files changed, 6 insertions, 2 deletions
diff --git a/Vars.make b/Vars.make
index 062094c..1a5d9d4 100644
--- a/Vars.make
+++ b/Vars.make
@@ -121 +121,5 @@ ifeq ($(STRIP),)
endif
+
+export CCACHE=$(shell which ccache 2>/dev/null)
+export DISTCC=$(shell which distcc 2>/dev/null)
+
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
@@ -10,3 +10,3 @@ CONFIG += qt warn_on release
-QMAKE_CC = gcc
+QMAKE_CC = $(CCACHE) $(DISTCC) gcc
QMAKE_LEX = flex
@@ -24,3 +24,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT
-QMAKE_CXX = g++
+QMAKE_CXX = $(CCACHE) $(DISTCC) g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)