enable ccache (and distcc if CCACHE_PREFIX and DISTCC_HOSTS are set) building

author: clem <clem> 2004-10-14 14:45:51 (UTC)
committer: clem <clem> 2004-10-14 14:45:51 (UTC)
commit: c1527ffba858ba88dc349edea26347eca37ccef4 (patch) (unidiff)
tree: b1eda5042f37ac822fda0053e0cdac4b4cb91cb8
parent: c4455769d3d0b6409e2f676e9e3769ed93d1772e (diff)
download: opie-c1527ffba858ba88dc349edea26347eca37ccef4.zip
opie-c1527ffba858ba88dc349edea26347eca37ccef4.tar.gz
opie-c1527ffba858ba88dc349edea26347eca37ccef4.tar.bz2
3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 244f9a8..20d1b63 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -8,7 +8,7 @@ MAKEFILE_GENERATOR	= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
-        QMAKE_CC        = arm-linux-gcc
+        QMAKE_CC        = $(shell which ccache) $(shell which arm-linux-gcc)
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  =
        QMAKE_YACC      = yacc
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB	= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
-        QMAKE_CXX       = arm-linux-g++
+        QMAKE_CXX       = $(shell which ccache) $(shell which arm-linux-g++)
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index adde72b..83fed4b 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -8,7 +8,7 @@ MAKEFILE_GENERATOR	= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
-        QMAKE_CC        = arm-linux-gcc
+        QMAKE_CC        = $(shell which ccache) $(shell which arm-linux-gcc)
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  =
        QMAKE_YACC      = yacc
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB	= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
-        QMAKE_CXX       = arm-linux-g++ -DQT_QWS_IPAQ
+        QMAKE_CXX       = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
diff --git a/qmake/Makefile b/qmake/Makefile
index 5a72210..3045766 100644
--- a/qmake/Makefile
+++ b/qmake/Makefile
@@ -1,7 +1,7 @@
 QMAKESPECSDIR=$(OPIEDIR)/mkspecs
-        CC      = gcc
+        CC      = $(shell which ccache) gcc
-        CXX     = g++
+        CXX     = $(shell which ccache) g++
 #qmake code
 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
author	clem <clem>	2004-10-14 14:45:51 (UTC)
committer	clem <clem>	2004-10-14 14:45:51 (UTC)
commit	c1527ffba858ba88dc349edea26347eca37ccef4 (patch) (unidiff)
tree	b1eda5042f37ac822fda0053e0cdac4b4cb91cb8
parent	c4455769d3d0b6409e2f676e9e3769ed93d1772e (diff)
download	opie-c1527ffba858ba88dc349edea26347eca37ccef4.zip opie-c1527ffba858ba88dc349edea26347eca37ccef4.tar.gz opie-c1527ffba858ba88dc349edea26347eca37ccef4.tar.bz2

diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 244f9a8..20d1b63 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-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 = arm-linux-gcc	11	QMAKE_CC = $(shell which ccache) $(shell which arm-linux-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 = arm-linux-g++	25	QMAKE_CXX = $(shell which ccache) $(shell which arm-linux-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


diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index adde72b..83fed4b 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-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 = arm-linux-gcc	11	QMAKE_CC = $(shell which ccache) $(shell which arm-linux-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 = arm-linux-g++ -DQT_QWS_IPAQ	25	QMAKE_CXX = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
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


diff --git a/qmake/Makefile b/qmake/Makefile index 5a72210..3045766 100644 --- a/qmake/Makefile +++ b/qmake/Makefile
@@ -1,7 +1,7 @@
1	QMAKESPECSDIR=$(OPIEDIR)/mkspecs	1	QMAKESPECSDIR=$(OPIEDIR)/mkspecs
2		2
3	CC = gcc	3	CC = $(shell which ccache) gcc
4	CXX = g++	4	CXX = $(shell which ccache) g++
5		5
6	#qmake code	6	#qmake code
7	OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \	7	OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \