svn commit: r297250 - in head: bin/csh lib/ncurses/ncurses

[Bryan Drewery]

Author: bdrewery
Date: Thu Mar 24 21:48:13 2016
New Revision: 297250
URL: https://svnweb.freebsd.org/changeset/base/297250

Log:
  CCACHE_BUILD: Don't use ccache when generating some files with CC -E.
  
  At least for ncurses this fixes a build error due to it trying to run
  'ccache --version' to work around a gcc 5 bug using the fix in r287205.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/bin/csh/Makefile
  head/lib/ncurses/ncurses/Makefile

Modified: head/bin/csh/Makefile
==============================================================================
--- head/bin/csh/Makefile	Thu Mar 24 21:48:10 2016	(r297249)
+++ head/bin/csh/Makefile	Thu Mar 24 21:48:13 2016	(r297250)
@@ -140,7 +140,7 @@ tc.const.h: tc.const.c sh.char.h config.
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_tc_const' >> ${.TARGET}
 	@echo '#define _h_tc_const' >> ${.TARGET}
-	${CC} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \
+	${CC:N${CCACHE_BIN}} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \
 	    grep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile	Thu Mar 24 21:48:10 2016	(r297249)
+++ head/lib/ncurses/ncurses/Makefile	Thu Mar 24 21:48:13 2016	(r297250)
@@ -331,7 +331,7 @@ codes.c: MKcodes.awk
 	${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c
 
 lib_gen.c: MKlib_gen.sh curses.h
-	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
+	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC:N${CCACHE_BIN}} -E ${CFLAGS}" \
 	    "${AWK}" generated < curses.h >$@
 
 lib_keyname.c: keys.list MKkeyname.awk
@@ -346,14 +346,14 @@ comp_captab.c: MKcaptab.sh MKcaptab.awk 
 	    ${NCURSES_DIR}/include/Caps > comp_captab.c
 
 expanded.c: MKexpanded.sh
-	sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC} -E" ${CFLAGS} >expanded.c
+	sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c
 
 fallback.c: MKfallback.sh
 	sh ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh > fallback.c
 
 # Generated headers
 nomacros.h: MKlib_gen.sh curses.h
-	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
+	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC:N${CCACHE_BIN}} -E ${CFLAGS}" \
 	    "${AWK}" generated < curses.h | fgrep undef > $@
 
 init_keytry.h: keys.list make_keys