| author | eilers <eilers> | 2004-12-20 16:04:15 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-12-20 16:04:15 (UTC) |
| commit | e35c9d95f2b1609798529e527282e145b370f505 (patch) (unidiff) | |
| 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,8 +1,15 @@ | |||
| 1 | QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 1 | QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
| 2 | 2 | ||
| 3 | include ../.config | ||
| 4 | |||
| 5 | ifeq ($(strip $(CONFIG_USE_CCACHE)),y) | ||
| 3 | CC = $(shell which ccache) gcc | 6 | CC = $(shell which ccache) gcc |
| 4 | CXX = $(shell which ccache) g++ | 7 | CXX = $(shell which ccache) g++ |
| 8 | else | ||
| 9 | CC = gcc | ||
| 10 | CXX = g++ | ||
| 11 | endif | ||
| 5 | 12 | ||
| 6 | #qmake code | 13 | #qmake code |
| 7 | OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ | 14 | OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ |
| 8 | borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ | 15 | borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ |