Date: Sat, 13 Jun 2015 22:54:47 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r284361 - user/ngie/more-tests Message-ID: <201506132254.t5DMslrB055947@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Jun 13 22:54:46 2015 New Revision: 284361 URL: https://svnweb.freebsd.org/changeset/base/284361 Log: Re-add some guards around bmake-specific code in Makefile Modified: user/ngie/more-tests/Makefile Modified: user/ngie/more-tests/Makefile ============================================================================== --- user/ngie/more-tests/Makefile Sat Jun 13 22:40:40 2015 (r284360) +++ user/ngie/more-tests/Makefile Sat Jun 13 22:54:46 2015 (r284361) @@ -99,6 +99,11 @@ # # For more information, see the build(7) manual page. # +.ifdef .PARSEDIR +MK_META_MODE?= yes +.else +MK_META_MODE= no +.endif .if ${MK_META_MODE} == "yes" # targets/Makefile plays the role of top-level .include "targets/Makefile" @@ -521,6 +526,7 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT +.ifdef .PARSEDIR # This makefile does not run in meta mode .MAKE.MODE= normal # Normally the things we run from here don't either. @@ -532,6 +538,7 @@ MK_STAGING= no # tell meta.autodep.mk to not even think about updating anything. UPDATE_DEPENDFILE= NO .export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE +.endif .if make(universe) # we do not want a failure of one branch abort all.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506132254.t5DMslrB055947>