diff --git a/share/mk/Makefile b/share/mk/Makefile index 737b11d5a0f..ec9af16d24c 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -69,8 +69,10 @@ FILES= \ meta.sys.mk \ meta2deps.py \ meta2deps.sh \ + ${SRCTOP}/contrib/bmake/mk/newlog.sh \ ${SRCTOP}/contrib/bmake/mk/posix.mk \ stage-install.sh \ + ${SRCTOP}/contrib/bmake/mk/setopts.sh \ sys.mk \ sys.dependfile.mk \ sys.dirdeps.mk \ @@ -78,6 +80,11 @@ FILES= \ FILESDIR= ${BINDIR}/mk +# make sure scripts are executable +.for file in ${FILES:M*.sh} ${FILES:M*.py} +FILESMODE_${file} = 555 +.endfor + .if ${MK_TESTS} != "no" FILES+= atf.test.mk FILES+= googletest.test.inc.mk diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk index 71a46f122bf..470c2d8559e 100644 --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -43,6 +43,12 @@ TIME_STAMP_END?= ${TIME_STAMP_DATE} # error spam and show a proper error. Mkdirs= Mkdirs() { mkdir -p $$* || :; } +# jobs.mk wants this +.if empty(NEWLOG_SH) +NEWLOG_SH:= ${SRCTOP}/contrib/bmake/mk/newlog.sh +.export NEWLOG_SH +.endif + .if !empty(.MAKEFLAGS:M-s) ECHO_TRACE?= true .endif