Author: bdrewery
Date: Wed Jun 27 19:29:15 2018
New Revision: 335733
URL: https://svnweb.freebsd.org/changeset/base/335733

Log:
  Don't use CCACHE for linking.
  
  MFC after:    2 weeks
  Sponsored by: Dell EMC

Modified:
  head/bin/csh/Makefile
  head/gnu/usr.bin/cc/cc1/Makefile
  head/gnu/usr.bin/cc/cc1plus/Makefile
  head/gnu/usr.bin/cc/cc_tools/Makefile
  head/lib/libmagic/Makefile
  head/lib/libpam/static_libpam/Makefile
  head/lib/ncurses/ncurses/Makefile
  head/share/syscons/scrnmaps/Makefile
  head/stand/mips/beri/boot2/Makefile
  head/usr.bin/vi/catalog/Makefile

Modified: head/bin/csh/Makefile
==============================================================================
--- head/bin/csh/Makefile       Wed Jun 27 19:28:37 2018        (r335732)
+++ head/bin/csh/Makefile       Wed Jun 27 19:29:15 2018        (r335733)
@@ -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

Modified: head/gnu/usr.bin/cc/cc1/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc1/Makefile    Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/gnu/usr.bin/cc/cc1/Makefile    Wed Jun 27 19:29:15 2018        
(r335733)
@@ -20,7 +20,7 @@ LDADD=        ${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIB
 
 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

Modified: head/gnu/usr.bin/cc/cc1plus/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc1plus/Makefile        Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/gnu/usr.bin/cc/cc1plus/Makefile        Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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

Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile       Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile       Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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.

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile  Wed Jun 27 19:28:37 2018        (r335732)
+++ head/lib/libmagic/Makefile  Wed Jun 27 19:29:15 2018        (r335733)
@@ -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 }' \

Modified: head/lib/libpam/static_libpam/Makefile
==============================================================================
--- head/lib/libpam/static_libpam/Makefile      Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/lib/libpam/static_libpam/Makefile      Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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"

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile   Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/lib/ncurses/ncurses/Makefile   Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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

Modified: head/share/syscons/scrnmaps/Makefile
==============================================================================
--- head/share/syscons/scrnmaps/Makefile        Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/share/syscons/scrnmaps/Makefile        Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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>

Modified: head/stand/mips/beri/boot2/Makefile
==============================================================================
--- head/stand/mips/beri/boot2/Makefile Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/stand/mips/beri/boot2/Makefile Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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
 

Modified: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile    Wed Jun 27 19:28:37 2018        
(r335732)
+++ head/usr.bin/vi/catalog/Makefile    Wed Jun 27 19:29:15 2018        
(r335733)
@@ -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
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to