[src/trunk]: src/sys/dev Revert previous to make iscsi kernel headers optiona...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd4c545876a4
branches:  trunk
changeset: 954959:fd4c545876a4
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Sep 14 00:40:03 2020 +0000

description:
Revert previous to make iscsi kernel headers optional again, as
required by kamil.

Now, sanitizer in GCC9 has been fixed differently for MKISCSI=no.

diffstat:

 sys/dev/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r f2e598225d99 -r fd4c545876a4 sys/dev/Makefile
--- a/sys/dev/Makefile  Mon Sep 14 00:40:02 2020 +0000
+++ b/sys/dev/Makefile  Mon Sep 14 00:40:03 2020 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.45 2020/09/10 01:53:22 rin Exp $
+#      $NetBSD: Makefile,v 1.46 2020/09/14 00:40:03 rin Exp $
 
 SUBDIR=        apm ata bluetooth dec dm dmover dtv hdaudio hdmicec hid hpc \
-       i2c i2o ic ieee1394 ir isa iscsi \
+       i2c i2o ic ieee1394 ir isa \
        microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
        spi sun tc usb vme wscons
 
@@ -11,6 +11,10 @@
 
 .include <bsd.own.mk>
 
+.if ${MKISCSI} != "no"
+SUBDIR+= iscsi
+.endif
+
 INCSDIR= /usr/include/dev
 
 # Only install includes which are used by userland