diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-16 04:23:45 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-16 04:23:45 +0000 |
| commit | 9a0f095e80b414dfa86c07ac17998b455cc982e8 (patch) | |
| tree | b5c8fd0aecb480e436e0e5d1e67a07c4db64f1c2 | |
| parent | a1f47ea5384ed91ee4f80402eb3740b103b594c9 (diff) | |
| download | FreeBSD-src-9a0f095e80b414dfa86c07ac17998b455cc982e8.zip FreeBSD-src-9a0f095e80b414dfa86c07ac17998b455cc982e8.tar.gz | |
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'.
| -rw-r--r-- | share/mk/bsd.subdir.mk | 7 | ||||
| -rw-r--r-- | share/mk/suite.test.mk | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 9d2eb17..84382e3 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -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 diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk index 0d48950..7061261 100644 --- a/share/mk/suite.test.mk +++ b/share/mk/suite.test.mk @@ -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."; \ |
