summaryrefslogtreecommitdiff
authorclem <clem>2004-10-14 19:57:37 (UTC)
committer clem <clem>2004-10-14 19:57:37 (UTC)
commitb45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1 (patch) (unidiff)
tree1a769f1ea0153cc12709188669da912abeb0c58a
parente8fe99dbb1c0babb24158dfd1b294473f2d12d8c (diff)
downloadopie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.zip
opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.tar.gz
opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.tar.bz2
Using CCACHE since it's been already defined as `which ccache` by Vars.make
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/qws/linux-arm-g++/qmake.conf4
-rw-r--r--mkspecs/qws/linux-ipaq-g++/qmake.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 20d1b63..62a8b5b 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 = $(shell which ccache) $(shell which arm-linux-gcc) 11 QMAKE_CC = $(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 = $(shell which ccache) $(shell which arm-linux-g++) 25 QMAKE_CXX = $(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 83fed4b..7c4c421 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 = $(shell which ccache) $(shell which arm-linux-gcc) 11 QMAKE_CC = $(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 = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ 25 QMAKE_CXX = $(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