--- origsrc/bmake/Makefile	2024-03-09 12:00:00.000000000 +0000
+++ src/bmake/Makefile	2024-03-09 12:00:00.000000000 +0000
@@ -90,7 +90,7 @@ OS := ${.MAKE.OS:U${uname -s:L:sh}}
 # are we 4.4BSD ?
 isBSD44:=${BSD44_LIST:M${OS}}
 
-.if ${isBSD44} == "" && ${OS:NDarwin:NLinux} != ""
+.if ${isBSD44} == "" && ${OS:NCYGWIN*:NDarwin:NLinux} != ""
 MANTARGET= cat
 INSTALL?=${srcdir}/install-sh
 .if ${MACHINE} == "sun386"
@@ -192,7 +192,7 @@ CONFIGURE_ARGS += --without-makefile
 AUTOCONF_GENERATED_MAKEFILE = Makefile.config
 .include <autoconf.mk>
 .endif
-SHARE_MK ?= ${SHAREDIR}/mk
+SHARE_MK ?= ${DEFAULT_SYS_PATH}
 MKSRC = ${srcdir}/mk
 INSTALL ?= ${srcdir}/install-sh
 
--- origsrc/bmake/boot-strap	2024-03-09 12:00:00.000000000 +0000
+++ src/bmake/boot-strap	2024-03-09 12:00:00.000000000 +0000
@@ -69,6 +69,9 @@
 #		This is useful when $prefix/ is shared by multiple
 #		machines.
 #
+#	--skip-test
+#		Don't run test after build or before install.
+#
 #	Flags relevant when installing:
 #
 #	-DWITHOUT_INSTALL_MK
@@ -212,6 +215,7 @@ srcdir=$Mydir
 mksrc=$Mydir/mk
 objdir=
 quiet=:
+skip_test=false
 
 ${SKIP_RC:+:} source_rc .bmake-boot-strap.rc . "$Mydir/.." "$HOME"
 
@@ -249,6 +253,7 @@ do
                 INSTALL_BIN=$HOST_TARGET/bin;;
 	--install-destdir=*) INSTALL_DESTDIR=`get_optarg "$1"`;;
 	--install-prefix=*) INSTALL_PREFIX=`get_optarg "$1"`;;
+	--skip-test) skip_test=true;;
 	-DWITH*) INSTALL_ARGS="$INSTALL_ARGS $1";;
 	-s|--src) srcdir="$2"; shift;;
 	-m|--mksrc) mksrc="$2"; shift;;
@@ -428,7 +433,7 @@ op_build() {
 	chmod 755 make-bootstrap.sh || exit 1
 	./make-bootstrap.sh || exit 1
 	case "$op" in
-	build) op_test;;
+	build) $skip_test || op_test;;
 	esac
 }
 
@@ -448,7 +453,8 @@ op_clean() {
 }
 
 op_install() {
-	op_test
+	[ -x bmake ] || op_build
+	$skip_test || op_test
 	case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
 	,$HOST_TARGET/bin,*/$HOST_TARGET)
 		INSTALL_PREFIX=`dirname $prefix`
--- origsrc/bmake/unit-tests/Makefile	2024-03-09 12:00:00.000000000 +0000
+++ src/bmake/unit-tests/Makefile	2024-03-09 12:00:00.000000000 +0000
@@ -474,6 +474,13 @@ BROKEN_TESTS+= sh-flags
 BROKEN_TESTS+= varmod-localtime
 .endif
 
+.if ${.MAKE.OS:NCYGWIN*} == ""
+BROKEN_TESTS+= \
+	export \
+	opt-chdir \
+	opt-keep-going-indirect
+.endif
+
 .if ${.MAKE.OS:NDarwin} == ""
 BROKEN_TESTS+= shell-ksh
 .endif