diff options
| author |   millert <millert@openbsd.org> | 2016-05-26 21:24:16 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2016-05-26 21:24:16 +0000 |
| commit | 7a078411e1493f89e0a5407101f1a143d25bf83f (patch) | |
| tree | 8133df0b5931dd36cd5b2ff2ea932f079ca87e33 | |
| parent | mklocale(1) can handle C-style and shell-style comments natively, (diff) | |
| download | wireguard-openbsd-7a078411e1493f89e0a5407101f1a143d25bf83f.tar.xz wireguard-openbsd-7a078411e1493f89e0a5407101f1a143d25bf83f.zip | |
Use "cc -E" instead of "cpp". OK deraadt@ natano@
| -rw-r--r-- | lib/libcurses/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/which/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index 31b40587f94..994d068232d 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.67 2016/03/30 06:38:42 jmc Exp $ +# $OpenBSD: Makefile,v 1.68 2016/05/26 21:24:16 millert Exp $ # Uncomment this to enable tracing in libcurses #CURSESTRACE=-DTRACE @@ -118,7 +118,7 @@ fallback.c: ${.CURDIR}/tinfo/MKfallback.sh sh ${.CURDIR}/tinfo/MKfallback.sh $(FALLBACK_LIST) > ${.TARGET} lib_gen.c: ${.CURDIR}/base/MKlib_gen.sh - sh ${.CURDIR}/base/MKlib_gen.sh "${CPP} -I${.CURDIR}" \ + sh ${.CURDIR}/base/MKlib_gen.sh "${CC} -E -P -I${.CURDIR}" \ "${AWK}" generated < ${.CURDIR}/curses.h > lib_gen.c init_keytry.h: make_keys keys.list @@ -135,7 +135,7 @@ make_hash: ${.CURDIR}/tinfo/comp_hash.c ${.CURDIR}/curses.priv.h \ expanded.c: ${.CURDIR}/term.h ${.CURDIR}/curses.priv.h \ ${.CURDIR}/ncurses_cfg.h ${.CURDIR}/tty/MKexpanded.sh - sh ${.CURDIR}/tty/MKexpanded.sh "${CPP}" ${CPPFLAGS} > ${.TARGET} + sh ${.CURDIR}/tty/MKexpanded.sh "${CC} -E -P" ${CPPFLAGS} > ${.TARGET} comp_captab.c: make_hash sh ${.CURDIR}/tinfo/MKcaptab.sh ${AWK} 1 \ diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile index 26b1262e66b..c0359e89c59 100644 --- a/usr.bin/which/Makefile +++ b/usr.bin/which/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2013/04/15 16:34:19 guenther Exp $ +# $OpenBSD: Makefile,v 1.9 2016/05/26 21:24:16 millert Exp $ PROG= which MAN= which.1 whereis.1 @@ -7,7 +7,7 @@ LINKS= ${BINDIR}/which ${BINDIR}/whereis check_path_in_man: @echo "Checking path expansion in whereis.1"; \ stdpath=`printf '#include <paths.h>\n_PATH_STDPATH\n' | \ - ${CPP} ${CPPFLAGS} - | \ + ${CC} -E -P ${CPPFLAGS} - | \ sed -n 's/^[ ]*"\(.*\)".*/.D1 \1/p'` ; \ fgrep -xq "$$stdpath" ${.CURDIR}/whereis.1 && { touch $@; exit 0; }; \ echo "Update the expansion of _PATH_STDPATH in ${.CURDIR}/whereis.1"; \ |