From ed8455806e88deeb7151b9bb23ad5026a36d252d Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Wed, 6 Jan 2021 17:51:03 +0000 Subject: [PATCH] Fix all warnings emitted in `make kernel-toolchain` With this change and D27598 make kernel-toolchain no longer emits any warnings for me. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D27599 --- bin/cat/cat.c | 6 +++++- tools/build/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 7668673f5e8..40d91b243bd 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -74,7 +74,9 @@ static const char *filename; static void usage(void) __dead2; static void scanfiles(char *argv[], int cooked); +#ifndef BOOTSTRAP_CAT static void cook_cat(FILE *); +#endif static void raw_cat(int); #ifndef NO_UDOM_SUPPORT @@ -178,11 +180,13 @@ usage(void) } static void -scanfiles(char *argv[], int cooked) +scanfiles(char *argv[], int cooked __unused) { int fd, i; char *path; +#ifndef BOOTSTRAP_CAT FILE *fp; +#endif i = 0; fd = -1; diff --git a/tools/build/Makefile b/tools/build/Makefile index 01a29ad730a..ee9d9692df3 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -105,9 +105,6 @@ INCS+= libcasper.h # not match. RPCINCS+= ${SRCTOP}/sys/rpc/types.h -.if ${.MAKE.OS} != "FreeBSD" -.PATH: ${.CURDIR}/cross-build - INCS+= ${SRCTOP}/include/mpool.h INCS+= ${SRCTOP}/include/ndbm.h INCS+= ${SRCTOP}/include/err.h @@ -143,6 +140,9 @@ INCS+= ${SRCTOP}/include/nlist.h SYSINCS+= ${SRCTOP}/sys/sys/imgact_aout.h SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h + +.if ${.MAKE.OS} != "FreeBSD" +.PATH: ${.CURDIR}/cross-build # dbopen() behaves differently on Linux and FreeBSD so we ensure that we # bootstrap the FreeBSD db code. The cross-build headers #define dbopen() to # __freebsd_dbopen() so that we don't ever use the host version