D27599.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D27599.diff
View Options

	diff --git a/bin/cat/cat.c b/bin/cat/cat.c
	--- a/bin/cat/cat.c
	+++ b/bin/cat/cat.c
	@@ -74,7 +74,9 @@

	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 @@
	}

	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
	--- a/tools/build/Makefile
	+++ b/tools/build/Makefile
	@@ -105,9 +105,6 @@
	# 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 @@
	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