svn commit: r363804 - head/lib/ncurses/ncurses

[John Baldwin]

Author: jhb
Date: Mon Aug  3 17:53:15 2020
New Revision: 363804
URL: https://svnweb.freebsd.org/changeset/base/363804

Log:
  Pass the full CFLAGS to cpp for MKlib_gen.sh.
  
  GCC's cpp was exiting immediately when it failed to find requested
  includes (<ncurses_cfg.h> and <ncurses_defs.h>).  clang-cpp emitted an
  error for the missing header files but continued processing the file
  (thus not honoring any macros defined in the missing headers).
  
  Arguably, the awk script is buggy since it doesn't check the return
  value of the command it executes.
  
  Reviewed by:	kevans
  Differential Revision:	https://reviews.freebsd.org/D25731

Modified:
  head/lib/ncurses/ncurses/Makefile

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile	Mon Aug  3 17:51:57 2020	(r363803)
+++ head/lib/ncurses/ncurses/Makefile	Mon Aug  3 17:53:15 2020	(r363804)
@@ -345,7 +345,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 ncurses_dll.h
-	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CPPFLAGS}" \
+	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CFLAGS}" \
 	    "${AWK}" generated < curses.h >$@
 
 lib_keyname.c: keys.list MKkeyname.awk