Author: ngie
Date: Thu Feb 16 04:23:45 2017
New Revision: 313789
URL: https://svnweb.freebsd.org/changeset/base/313789
Log:
MFC r288241:
r288241 (by bdrewery):
Remove 'set -e' that are no longer needed as it is already default.
When bmake was initially imported at r241298 shell commands were no longer
ran with 'set -e' as they were before. This was fixed in r254980 so they
again always use 'set -e'.
Modified:
stable/10/share/mk/bsd.subdir.mk
stable/10/share/mk/suite.test.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/mk/bsd.subdir.mk
==============================================================================
--- stable/10/share/mk/bsd.subdir.mk Thu Feb 16 04:21:24 2017
(r313788)
+++ stable/10/share/mk/bsd.subdir.mk Thu Feb 16 04:23:45 2017
(r313789)
@@ -45,7 +45,7 @@ distribute: .MAKE
_SUBDIR: .USE .MAKE
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
- @${_+_}set -e; for entry in ${SUBDIR:N.WAIT}; do \
+ @${_+_}for entry in ${SUBDIR:N.WAIT}; do \
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH}
(${.TARGET:S,realinstall,install,:S,^_sub.,,})"; \
edir=$${entry}.${MACHINE_ARCH}; \
@@ -86,8 +86,7 @@ __deps+= ${__target}_subdir_${__dep}
.endfor
${__target}_subdir_${__dir}: .PHONY .MAKE ${__deps}
.if !defined(NO_SUBDIR)
- @${_+_}set -e; \
- if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
+ @${_+_}if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH}
(${__target:realinstall=install})"; \
edir=${__dir}.${MACHINE_ARCH}; \
cd ${.CURDIR}/$${edir}; \
@@ -118,7 +117,7 @@ _sub.${__stage}${__target}: _SUBDIR
.endfor
.if !target(${__target})
${__target}: .MAKE
- ${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE}
install${__target}
+ ${_+_}cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE}
install${__target}
.endif
.endfor
Modified: stable/10/share/mk/suite.test.mk
==============================================================================
--- stable/10/share/mk/suite.test.mk Thu Feb 16 04:21:24 2017
(r313788)
+++ stable/10/share/mk/suite.test.mk Thu Feb 16 04:23:45 2017
(r313789)
@@ -90,8 +90,7 @@ realtest: .PHONY
@echo "*** installed in ${TESTSBASE}. This test run may raise false"
@echo "*** positives and/or false negatives."
@echo
- @set -e; \
- ${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
+ @${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
result=0; \
echo; \
echo "*** Once again, note that "make test" is unsupported."; \
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
