diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2011-01-25 13:39:44 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2011-01-25 13:39:44 +0000 |
| commit | 34532c51953ae3f1eafea1e9c506ae7f7ee4033c (patch) | |
| tree | f6e574c04abdb337aacddef2ac17283812ccc810 /Mk | |
| parent | e2c4f622e2fc9d9235ec8920524453a888f57b17 (diff) | |
| download | ports-34532c51953ae3f1eafea1e9c506ae7f7ee4033c.tar.gz ports-34532c51953ae3f1eafea1e9c506ae7f7ee4033c.zip | |
- Propagate return code of the DESTDIR chrooted make
PR: ports/153597
Submitted by: HIROSHI OOTA <xalaxy@gmail.com>
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268215
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.destdir.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.destdir.mk b/Mk/bsd.destdir.mk index 975fa2ec0569..8c3c00539f28 100644 --- a/Mk/bsd.destdir.mk +++ b/Mk/bsd.destdir.mk @@ -208,8 +208,8 @@ do-chroot: ${CHROOT} $${_destdir} ${SH} -c "\ cd $${PORTSDIR}${.CURDIR:S|^${PORTSDIR}||}; \ ${SETENV} -i ${DESTDIR_ENV} $${_var_path_list} ${MAKE} ${.TARGETS}" && \ - ${ECHO_MSG} "===> Chrooted make in ${DESTDIR} succeeded" || \ - ${ECHO_MSG} "===> Chrooted make in ${DESTDIR} failed"; \ + { status=$$?; ${ECHO_MSG} "===> Chrooted make in ${DESTDIR} succeeded"; } || \ + { status=$$?; ${ECHO_MSG} "===> Chrooted make in ${DESTDIR} failed"; }; \ ${ECHO_MSG} "===> Cleaning up..."; \ for _entry in $${_mounted_entries_list}; do \ ${UMOUNT} -f $${_entry} || ${TRUE}; \ @@ -217,6 +217,6 @@ do-chroot: for _entry in $${_created_mountpoints_list}; do \ ${RMDIR} $${_entry} || ${TRUE}; \ done; \ - exit 0 + exit $$status .endif # !target(do-chroot) .endif # !defined(_DESTDIRMKINCLUDED) |