| author | eilers <eilers> | 2004-12-20 16:04:15 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-12-20 16:04:15 (UTC) |
| commit | e35c9d95f2b1609798529e527282e145b370f505 (patch) (side-by-side diff) | |
| tree | 146eccb4081dda79e435603fef1c2927678cefe2 | |
| parent | 68ae26d1e6368ec73acf11d09067820fc882f402 (diff) | |
| download | opie-e35c9d95f2b1609798529e527282e145b370f505.zip opie-e35c9d95f2b1609798529e527282e145b370f505.tar.gz opie-e35c9d95f2b1609798529e527282e145b370f505.tar.bz2 | |
The "which" command on darwin always returns a string as output, even if
nothing was found. Therefore we have to disable this "which" if ccache
is not available!
| -rw-r--r-- | qmake/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/Makefile b/qmake/Makefile index 3045766..1054da4 100644 --- a/qmake/Makefile +++ b/qmake/Makefile @@ -1,28 +1,35 @@ QMAKESPECSDIR=$(OPIEDIR)/mkspecs +include ../.config + +ifeq ($(strip $(CONFIG_USE_CCACHE)),y) CC = $(shell which ccache) gcc CXX = $(shell which ccache) g++ +else +CC = gcc +CXX = g++ +endif #qmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ msvc_objectmodel.o meta.o qtmd5.o #qt code QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \ qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ qconfig.o qunicodetables.o qsettings.o qlocale.o #all sources, used for the depend target DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \ generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \ $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \ $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \ $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \ $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \ $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \ |