aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/csh/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile8
-rw-r--r--lib/libmagic/Makefile2
-rw-r--r--lib/libpam/static_libpam/Makefile3
-rw-r--r--lib/ncurses/ncurses/Makefile4
-rw-r--r--share/syscons/scrnmaps/Makefile4
-rw-r--r--stand/mips/beri/boot2/Makefile8
-rw-r--r--usr.bin/vi/catalog/Makefile2
10 files changed, 19 insertions, 18 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 4fb7b84fc92e..128ba5b19ab0 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -113,7 +113,7 @@ build-tools: gethost
gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
@rm -f ${.TARGET}
- ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
+ ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
${TCSHDIR}/gethost.c
tc.defs.c: gethost ${TCSHDIR}/host.defs
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index b306bfec2e12..7b2ec040ecd7 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -20,7 +20,7 @@ LDADD= ${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
DOBJS+= ${SRCS:N*.h:R:S/$/.o/g}
${PROG}-dummy: ${DOBJS}
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
CLEANFILES+= ${PROG}-dummy
${PROG}-checksum.c: ${PROG}-dummy
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 761dd699bdd3..1d9287453125 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -35,7 +35,7 @@ CLEANFILES= cfns.h
DOBJS+= ${SRCS:N*.h:R:S/$/.o/g}
${PROG}-dummy: ${DOBJS}
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
CLEANFILES+= ${PROG}-dummy
${PROG}-checksum.c: ${PROG}-dummy
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index adc101b299f3..2e5ff3884b14 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -276,7 +276,7 @@ CLEANFILES+= gengtype-yacc.c
gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
${LIBIBERTY}
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
gtype-desc.h: gengtype
${BTOOLSPATH:U.}/gengtype
@@ -292,18 +292,18 @@ CLEANFILES+= gt-*.h gtype-*.h
#
.for F in check checksum genrtl modes
gen$F: gen$F.o errors.o ${LIBIBERTY}
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
.endfor
.for F in attr attrtab automata codes conditions config constants emit \
extract flags opinit output peep preds recog
gen$F: gen$F.o rtl.o read-rtl.o ggc-none.o vec.o min-insn-modes.o \
gensupport.o print-rtl.o errors.o ${LIBIBERTY}
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
.endfor
gencondmd: gencondmd.o
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
#
# Generated .md files.
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 851c04c2c615..7febf1c2297c 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -43,7 +43,7 @@ magic.mgc: mkmagic magic
CLEANFILES+= mkmagic
build-tools: mkmagic
mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META}
- ${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \
${LDADD}
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile
index 2a8cc998ac87..f8a355d952a3 100644
--- a/lib/libpam/static_libpam/Makefile
+++ b/lib/libpam/static_libpam/Makefile
@@ -64,6 +64,7 @@ CLEANFILES+= openpam_static.o \
openpam_static_modules.o
openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
- ${CC} -nostdlib ${LDFLAGS} -o ${.TARGET} -r -Wl,--whole-archive ${.ALLSRC}
+ ${CC:N${CCACHE_BIN}} -nostdlib ${LDFLAGS} -o ${.TARGET} \
+ -r -Wl,--whole-archive ${.ALLSRC}
.include "${.CURDIR:H}/libpam/Makefile"
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index d880ebb8d00d..2969dfc8948c 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -391,10 +391,10 @@ keys.list: MKkeys_list.sh Caps
build-tools: make_hash make_keys
make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META}
- ${CC} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c
+ ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c
make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META}
- ${CC} -o $@ ${CFLAGS} -DMAIN_PROGRAM \
+ ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \
${NCURSES_DIR}/ncurses/tinfo/make_hash.c
# ./configure generated
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index 1a082a5d2871..c8d3db54dcb3 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -20,7 +20,7 @@ ${SCRMAPS}: ${.TARGET:R}.mk
rm -f ${.TARGET:R}.tmp
${SCRMAPS_MK}: ${.TARGET:R} mkscrfil.c ${BUILD_TOOLS_META}
- ${CC} ${CFLAGS} -I${.CURDIR} -DFIL=\"${.TARGET:R}\" ${LDFLAGS} \
- -o ${.TARGET} ${.CURDIR}/mkscrfil.c
+ ${CC:N${CCACHE_BIN}} ${CFLAGS} -I${.CURDIR} -DFIL=\"${.TARGET:R}\" \
+ ${LDFLAGS} -o ${.TARGET} ${.CURDIR}/mkscrfil.c
.include <bsd.prog.mk>
diff --git a/stand/mips/beri/boot2/Makefile b/stand/mips/beri/boot2/Makefile
index f4b433ce488a..afc061b4eb05 100644
--- a/stand/mips/beri/boot2/Makefile
+++ b/stand/mips/beri/boot2/Makefile
@@ -60,16 +60,16 @@ LDFLAGS+= -static \
CFLAGS+= -I${BOOTSRC}/mips/beri/common
flashboot.elf: relocate.o start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
- ${CC} ${LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET} \
- ${.ALLSRC} ${LIBSA}
+ ${CC:N${CCACHE_BIN}} ${LDFLAGS} -T ${.CURDIR}/flashboot.ldscript \
+ -o ${.TARGET} ${.ALLSRC} ${LIBSA}
flashboot: flashboot.elf
${OBJCOPY} -S -O binary ${.TARGET}.elf ${.TARGET}
flashboot.md5: flashboot
md5 flashboot > flashboot.md5
jtagboot: start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
- ${CC} ${LDFLAGS} -T ${.CURDIR}/jtagboot.ldscript -o ${.TARGET} \
- ${.ALLSRC} ${LIBSA}
+ ${CC:N${CCACHE_BIN}} ${LDFLAGS} -T ${.CURDIR}/jtagboot.ldscript \
+ -o ${.TARGET} ${.ALLSRC} ${LIBSA}
jtagboot.md5: jtagboot
md5 jtagboot > jtagboot.md5
diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile
index ba2fa9c9c7a4..a8977dd809f6 100644
--- a/usr.bin/vi/catalog/Makefile
+++ b/usr.bin/vi/catalog/Makefile
@@ -106,7 +106,7 @@ english.base: dump ${SCAN} #Makefile
dump: dump.c ${BUILD_TOOLS_META}
- ${CC} -o ${.TARGET} ${.ALLSRC}
+ ${CC:N${CCACHE_BIN}} -o ${.TARGET} ${.ALLSRC}
CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2