FreeBSD Mail Archives

Date:      Wed, 8 Aug 2018 18:05:14 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r337477 - in stable/11: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/...
Message-ID:  <201808081805.w78I5ETo018454@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help

Author: bdrewery
Date: Wed Aug  8 18:05:14 2018
New Revision: 337477
URL: https://svnweb.freebsd.org/changeset/base/337477

Log:
  MFC r335733:
  
    Don't use CCACHE for linking.

Modified:
  stable/11/bin/csh/Makefile
  stable/11/gnu/usr.bin/cc/cc1/Makefile
  stable/11/gnu/usr.bin/cc/cc1plus/Makefile
  stable/11/gnu/usr.bin/cc/cc_tools/Makefile
  stable/11/lib/libmagic/Makefile
  stable/11/lib/libpam/static_libpam/Makefile
  stable/11/lib/ncurses/ncurses/Makefile
  stable/11/share/syscons/scrnmaps/Makefile
  stable/11/stand/mips/beri/boot2/Makefile
  stable/11/usr.bin/vi/catalog/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/csh/Makefile
==============================================================================
--- stable/11/bin/csh/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/bin/csh/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/gnu/usr.bin/cc/cc1/Makefile
==============================================================================
--- stable/11/gnu/usr.bin/cc/cc1/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/gnu/usr.bin/cc/cc1/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/gnu/usr.bin/cc/cc1plus/Makefile
==============================================================================
--- stable/11/gnu/usr.bin/cc/cc1plus/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/gnu/usr.bin/cc/cc1plus/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- stable/11/gnu/usr.bin/cc/cc_tools/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/gnu/usr.bin/cc/cc_tools/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/lib/libmagic/Makefile
==============================================================================
--- stable/11/lib/libmagic/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/lib/libmagic/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/lib/libpam/static_libpam/Makefile
==============================================================================
--- stable/11/lib/libpam/static_libpam/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/lib/libpam/static_libpam/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/lib/ncurses/ncurses/Makefile
==============================================================================
--- stable/11/lib/ncurses/ncurses/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/lib/ncurses/ncurses/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/share/syscons/scrnmaps/Makefile
==============================================================================
--- stable/11/share/syscons/scrnmaps/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/share/syscons/scrnmaps/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/stand/mips/beri/boot2/Makefile
==============================================================================
--- stable/11/stand/mips/beri/boot2/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/stand/mips/beri/boot2/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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: stable/11/usr.bin/vi/catalog/Makefile
==============================================================================
--- stable/11/usr.bin/vi/catalog/Makefile	Wed Aug  8 18:03:57 2018	(r337476)
+++ stable/11/usr.bin/vi/catalog/Makefile	Wed Aug  8 18:05:14 2018	(r337477)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808081805.w78I5ETo018454>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation