Build error on amd64 for XEN3_DOMU kernel

[Paul Goyette <paul%whooppee.com@localhost>]

I'm seeing the following errors when building XEN3_DOMU

Build directory is /build/netbsd-local/obj/amd64/sys/arch/amd64/compile/INSTALL_XEN3_DOMU
Don't forget to run "make depend"
/build/netbsd-local/tools/x86_64/amd64/bin/nbmake -C /build/netbsd-local/obj/amd64/sys/arch/amd64/compile/INSTALL_XEN3_DOMU depend &&  /build/netbsd-local/tools/x86_64/amd64/bin/nbmake -C /build/netbsd-local/obj/amd64/sys/arch/amd64/compile/INSTALL_XEN3_DOMU
sh: 1: Syntax error: end of file unexpected
*** Failed target:  .BEGIN
*** Failed command: rm -rf xen-ma && mkdir xen-ma && ln -s ../amd64 xen-ma/machine &&
*** Error code 2 (ignored)
...
In file included from /build/netbsd-local/src_ro/sys/lib/libkern/__main.c:33:0:/build/netbsd-local/src_ro/sys/sys/types.h:45:27: fatal error: machine/types.h:
No such file or directory
compilation terminated.
nbmkdep: compile failed.
*** [__main.d] Error code 1
nbmake[3]: stopped in /build/netbsd-local/obj/amd64/sys/arch/amd64/compile/INSTALL_XEN3_DOMU/lib/kern
1 error


The following patch seems to fix things (thanks to maya@):

--- src/sys/arch/xen/conf/Makefile.xen.orig	2017-12-12 10:25:00.286355000 +0900
+++ src/sys/arch/xen/conf/Makefile.xen	2017-12-12 10:25:31.930025000 +0900
@@ -92,7 +92,7 @@
 	    ln -s $S/arch/${A}/include ${A}
 .endfor
 	-@rm -rf xen-ma && \
-	    mkdir xen-ma && ln -s ../${XEN_BUILD} xen-ma/machine &&
+	    mkdir xen-ma && ln -s ../${XEN_BUILD} xen-ma/machine
 	-@rm -f machine && \
 	    ln -s ${ARCH_INC} machine
.endif


+------------------+--------------------------+----------------------------+
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:          |
| (Retired)        | FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org |
+------------------+--------------------------+----------------------------+