Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/build.sh,v
rcsdiff: /ftp/cvs/cvsroot/src/build.sh,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.316.4.2
retrieving revision 1.317
diff -u -p -r1.316.4.2 -r1.317
--- src/build.sh	2018/02/26 13:52:00	1.316.4.2
+++ src/build.sh	2017/10/02 15:40:00	1.317
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.316.4.2 2018/02/26 13:52:00 martin Exp $
+#	$NetBSD: build.sh,v 1.317 2017/10/02 15:40:00 maya Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1442,23 +1442,9 @@ sanitycheck()
 		;;
 	esac
 
-	while [ ${MKX11-no} = "yes" ]; do		# not really a loop
-		test -n "${X11SRCDIR}" && {
-		    test -d "${X11SRCDIR}" ||
-		    	bomb "X11SRCDIR (${X11SRCDIR}) does not exist (with -x)"
-		    break
-		}
-		for _xd in \
-		    "${NETBSDSRCDIR%/*}/xsrc" \
-		    "${NETBSDSRCDIR}/xsrc" \
-		    /usr/xsrc
-		do
-		    test -d "${_xd}" &&
-			setmakeenv X11SRCDIR "${_xd}" &&
-			break 2
-		done
-		bomb "Asked to build X11 but no xsrc"
-	done
+	if [ ${MKX11-no} = "yes" ]; then
+		test -d ${X11SRCDIR-/usr/xsrc} || bomb "Asked to build X11 but no xsrc"
+	fi
 }
 
 # print_tooldir_make --
@@ -1635,8 +1621,13 @@ rebuildmake()
 
 	statusmsg "Bootstrapping ${toolprefix}make"
 	${runcmd} cd "${tmpdir}"
-	${runcmd} env CC="${HOST_CC-cc}" CPPFLAGS="${HOST_CPPFLAGS}" \
-		CFLAGS="${HOST_CFLAGS--O}" LDFLAGS="${HOST_LDFLAGS}" \
+	${runcmd} env \
+\
+CC="${HOST_CC-cc}" \
+CPPFLAGS="${HOST_CPPFLAGS} -D_PATH_DEFSYSPATH="'\"'${NETBSDSRCDIR}/share/mk'\"' \
+CFLAGS="${HOST_CFLAGS--O}" \
+LDFLAGS="${HOST_LDFLAGS}" \
+\
 	    ${HOST_SH} "${TOP}/tools/make/configure" ||
 	( cp ${tmpdir}/config.log ${tmpdir}-config.log
 	      bomb "Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details" )
@@ -1907,7 +1898,7 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.316.4.2 2018/02/26 13:52:00 martin Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.317 2017/10/02 15:40:00 maya Exp $
 # with these arguments: ${_args}
 #