D14315.id.diff
No OneTemporary
Actions

Size

931 B

Referenced Files

None

Subscribers

None

D14315.id.diff
View Options

	Index: contrib/bmake/meta.c
	===================================================================
	--- contrib/bmake/meta.c
	+++ contrib/bmake/meta.c
	@@ -790,7 +790,9 @@
	{
	int error = 0;
	BuildMon *pbm = pbmp;
	+#ifdef USE_FILEMON
	int x;
	+#endif

	if (!pbm)
	pbm = &Mybm;
	Index: usr.bin/bmake/Makefile
	===================================================================
	--- usr.bin/bmake/Makefile
	+++ usr.bin/bmake/Makefile
	@@ -92,7 +92,9 @@
	CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
	COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\""

	-# meta mode can be useful even without filemon
	+# meta mode can be useful even without filemon
	+# FIXME: this logic is wrong, we should be detecting if the target system
	+# has filemon and not be looking at the host.
	FILEMON_H ?= /usr/include/dev/filemon/filemon.h
	.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h"
	COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}