diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-05-23 21:06:11 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-07-12 09:49:31 -0500 |
| commit | 44b63a15ac243ed21fcd35704838baced09ed64c (patch) | |
| tree | 1e5a239057168265ed50371e99a8c784df2d8436 /src | |
| parent | b9c5a79eb89e837981f7743569b715923d8b4c75 (diff) | |
| download | blackbird-hostboot-44b63a15ac243ed21fcd35704838baced09ed64c.tar.gz blackbird-hostboot-44b63a15ac243ed21fcd35704838baced09ed64c.zip | |
Support ccache.
Change-Id: I38b3c391f2fd33ec21d9c11d1088e284216b8b3b
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5133
Tested-by: Jenkins Server
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/build/linker/makefile | 4 | ||||
| -rw-r--r-- | src/build/mkrules/cc.env.mk | 4 | ||||
| -rw-r--r-- | src/build/trace/makefile | 3 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/framework/rule/makefile | 6 | ||||
| -rw-r--r-- | src/usr/hwpf/makefile | 14 |
5 files changed, 18 insertions, 13 deletions
diff --git a/src/build/linker/makefile b/src/build/linker/makefile index acb1993e0..3957cbf6a 100644 --- a/src/build/linker/makefile +++ b/src/build/linker/makefile @@ -28,5 +28,7 @@ CLEAN_TARGETS += linker include $(ROOTPATH)/config.mk linker: linker.C - $(HOST_PREFIX)g++ -O3 -g linker.C -o linker -lbfd -liberty -lz + $(C2) " CXX $(notdir $<)" + $(C1)$(CCACHE) $(HOST_PREFIX)g++ -O3 -g linker.C -o linker \ + -lbfd -liberty -lz diff --git a/src/build/mkrules/cc.env.mk b/src/build/mkrules/cc.env.mk index 1b36762ac..6b905ec78 100644 --- a/src/build/mkrules/cc.env.mk +++ b/src/build/mkrules/cc.env.mk @@ -30,8 +30,8 @@ HOST_PREFIX ?= x86_64-pc-linux-gnu- CC_RAW = $(CROSS_PREFIX)gcc -std=c99 CXX_RAW = $(CROSS_PREFIX)g++ -CC = $(CC_RAW) -CXX = $(CXX_RAW) +CC = $(CCACHE) $(CC_RAW) +CXX = $(CCACHE) $(CXX_RAW) LD = $(CROSS_PREFIX)ld OBJDUMP = $(CROSS_PREFIX)objdump diff --git a/src/build/trace/makefile b/src/build/trace/makefile index 06c5e8d16..0eb3a5592 100644 --- a/src/build/trace/makefile +++ b/src/build/trace/makefile @@ -28,4 +28,5 @@ CLEAN_TARGETS += tracehash include $(ROOTPATH)/config.mk tracehash: tracehash.c - $(HOST_PREFIX)gcc -std=c99 -O3 -g $< -o $@ -lbfd + $(C2) " CC $(notdir $<)" + $(C1)$(CCACHE) $(HOST_PREFIX)gcc -std=c99 -O3 -g $< -o $@ -lbfd diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile index cc3151c43..1db208551 100755 --- a/src/usr/diag/prdf/framework/rule/makefile +++ b/src/usr/diag/prdf/framework/rule/makefile @@ -98,20 +98,20 @@ ${PRDR_CMP_FLEX_C_PATH}: ${PRDR_CMP_FLEX} USERDEFINES = -D__HOSTBOOT_MODULE -O3 -pipe ${PRDR_CMP_YACC_o_PATH}: ${PRDR_CMP_YACC_C_PATH} ${PRDR_CMP_YACC_H_PATH} - $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ + $(CCACHE) $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ -I ${PRD_USR_PATH}/common/framework/rule \ -I ${PRD_USR_PATH}/common/util -I ${RULEOBJDIR} \ -o $@ ${PRDR_CMP_FLEX_o_PATH}: ${PRDR_CMP_FLEX_C_PATH} ${PRDR_CMP_YACC_H_PATH} - $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ + $(CCACHE) $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ -I ${PRD_USR_PATH}/common/framework/rule \ -I ${PRD_USR_PATH}/common/util -I ${RULEOBJDIR} \ -o $@ ${PRDR_CMP_o_PATH}: ${PRDR_CMP_C} mkdir -p ${RULEOBJDIR} - $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ + $(CCACHE) $(HOST_PREFIX)g++ -c $(USERDEFINES) $< \ -I ${PRD_USR_PATH}/common/framework/rule \ -I ${PRD_USR_PATH}/common \ -I ${PRD_USR_PATH}/common/util \ diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index e7c1f3901..746ffd616 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -231,9 +231,10 @@ $(call GENTARGET, ${IF_CMP_COMPILER_TARGET}) : \ ${GENDIR}/${IF_CMP_FLEX_TARGET} \ ${IF_COMPILER_C_FILES} \ ${IF_COMPILER_H_FILES} - g++ ${IF_COMPILER_C_FILES} ${GENDIR}/${IF_CMP_FLEX_TARGET} \ - ${GENDIR}/${IF_CMP_YACC_C_TARGET} -I ifcompiler -I ${GENDIR} \ - -I ${ROOTPATH}/src/include/usr/hwpf/hwp -o $@ + $(CCACHE) $(HOST_PREFIX)g++ -O3 ${IF_COMPILER_C_FILES} \ + ${GENDIR}/${IF_CMP_FLEX_TARGET} \ + ${GENDIR}/${IF_CMP_YACC_C_TARGET} -I ifcompiler -I ${GENDIR} \ + -I ${ROOTPATH}/src/include/usr/hwpf/hwp -o $@ #------------------------------------------------------------------------------ # The FAPI return code and error info files generated from Error XML files @@ -265,9 +266,10 @@ $${GENDIR}/$(basename $(notdir $1)).if :\ $${GENDIR}/$${IF_CMP_COMPILER_TARGET} \ $${GENDIR}/$${FAPI_ATTR_ID_TARGET} \ $${HWP_IF_DEFINE_DIR} $1 - $$< -init $1 -outdir $$(dir $$@) \ - -attr $${GENDIR}/$${FAPI_ATTR_ID_TARGET} \ - -I $${HWP_IF_DEFINE_DIR} + $$(HOST_PREFIX)jail \ + $$< -init $1 -outdir $$(dir $$@) \ + -attr $${GENDIR}/$${FAPI_ATTR_ID_TARGET} \ + -I $${HWP_IF_DEFINE_DIR} @bzip2 $${GENDIR}/$(basename $(notdir $1)).if.list $${GENDIR}/$(basename $(notdir $1)).if.list.bz2: \ |
