Add MKWATCHDOG option

share/mk/bsd.own.mk

@@ -756,6 +756,9 @@ _MKVARS.yes= \
 	MKSHARE MKSKEY MKSTATICLIB \
 	MKX11FONTS \
 	MKYP
+#MINIX-specific vars
+_MKVARS.yes+= \
+	MKWATCHDOG
 .for var in ${_MKVARS.yes}
 ${var}?=	yes
 .endfor
@@ -813,6 +816,11 @@ MKMAN:=		no
 MKNLS:=		no
 .endif
 
+# MINIX
+.if ${MKEMBED} == "yes"
+MKWATCHDOG:=	no
+.endif
+
 #
 # install(1) parameters.
 #
@@ -871,7 +879,8 @@ ${var}?= no
 # USE_* options which default to "yes" unless their corresponding MK*
 # variable is set to "no".
 #
-.for var in USE_HESIOD USE_INET6 USE_KERBEROS USE_LDAP USE_PAM USE_YP
+.for var in USE_HESIOD USE_INET6 USE_KERBEROS USE_LDAP USE_PAM USE_YP \
+USE_WATCHDOG
 .if (${${var:S/USE_/MK/}} == "no")
 ${var}:= no
 .else

share/mk/sys.mk

@@ -236,12 +236,6 @@ AR?=	aal
 .elif !empty(CC:M*gcc) || !empty(CC:M*clang) || !empty(CC:M*pcc)
 COMPILER_TYPE=gnu
 AR?=	ar
-
-.if defined(MKEMBED) && ${MKEMBED} == "yes"
-DBG=	-Os
-CFLAGS+= -DNDEBUG=1
-.endif
-
 .endif
 
 # Set NBSD_LIBC to either "yes" or "no".
@@ -250,3 +244,8 @@ NBSD_LIBC=	no
 .else
 NBSD_LIBC=	yes
 .endif
+
+.if ${COMPILER_TYPE} == "gnu" && defined(MKEMBED) && ${MKEMBED} == "yes"
+DBG=	-Os
+CFLAGS+= -DNDEBUG=1
+.endif