| author | mickeyl <mickeyl> | 2003-12-07 15:14:59 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-12-07 15:14:59 (UTC) |
| commit | d4f47b47a8d0b64daca4becf9169dee70c629bab (patch) (side-by-side diff) | |
| tree | 6c246e95a79ac468fc107aaf9f0904e4a4d40f27 | |
| parent | 4518f62746143246d29eb9f08030e241ac33eeb7 (diff) | |
| download | opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.zip opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.tar.gz opie-d4f47b47a8d0b64daca4becf9169dee70c629bab.tar.bz2 | |
allow the use of ccache and distcc (if available) for the x86 build
| -rw-r--r-- | Vars.make | 4 | ||||
| -rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -98,24 +98,28 @@ ifdef CONFIG_OPTIMIZATIONS export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) endif ifeq ($(STRIP),) ifneq ($(CONFIG_TARGET_X86),) STRIP=strip endif ifneq ($(CONFIG_TARGET_IPAQ),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_SHARP),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_RAMSES),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_SIMPAD),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_YOPY),) STRIP=arm-linux-strip endif 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 @@ -1,49 +1,49 @@ # # $Id$ # # qmake configuration for linux-g++ # MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt warn_on release -QMAKE_CC = gcc +QMAKE_CC = $(CCACHE) $(DISTCC) gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CXX = g++ +QMAKE_CXX = $(CCACHE) $(DISTCC) 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 QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -shared |