D38860.1785667056.diff
No OneTemporary
Actions

Size

873 B

Referenced Files

None

Subscribers

None

D38860.1785667056.diff
View Options

	diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
	--- a/usr.sbin/bhyve/Makefile
	+++ b/usr.sbin/bhyve/Makefile
	@@ -87,15 +87,7 @@
	.PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm
	SRCS+= vmm_instruction_emul.c

	-LIBADD= vmmapi md nv pthread z util sbuf cam 9p
	-
	-.if ${MK_CASPER} != "no"
	-LIBADD+= casper
	-LIBADD+= cap_pwd
	-LIBADD+= cap_grp
	-# Temporary disable capsicum, until we integrate checkpoint code with it.
	-#CFLAGS+=-DWITH_CASPER
	-.endif
	+LIBADD= vmmapi md nv pthread z util sbuf cam 9p casper cap_pwd cap_grp

	.if ${MK_BHYVE_SNAPSHOT} != "no"
	LIBADD+= ucl xo
	@@ -122,10 +114,6 @@
	CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/usb/controller
	.if ${MK_BHYVE_SNAPSHOT} != "no"
	CFLAGS+= -I${SRCTOP}/contrib/libucl/include
	-
	-# Temporary disable capsicum, until we integrate checkpoint code with it.
	-CFLAGS+= -DWITHOUT_CAPSICUM
	-
	CFLAGS+= -DBHYVE_SNAPSHOT
	.endif