aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/cat/cat.c6
-rw-r--r--tools/build/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 7668673f5e89..40d91b243bd4 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 01a29ad730af..ee9d9692df3b 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