svn commit: r351444 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Apr 17 04:02:59 2014
New Revision: 351444
URL: http://svnweb.freebsd.org/changeset/ports/351444
QAT: https://qat.redports.org/buildarchive/r351444/

Log:
  - Create a DO_MAKE_BUILD which will do the right thing for building, such
    as setting MAKE_ENV. Without this things like WITH_CCACHE_BUILD do not
    properly work if a port does its own building.
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Apr 17 03:54:08 2014	(r351443)
+++ head/Mk/bsd.port.mk	Thu Apr 17 04:02:59 2014	(r351444)
@@ -3664,9 +3664,10 @@ do-configure:
 
 # Build
 # XXX: ${MAKE_ARGS:N${DESTDIRNAME}=*} would be easier but it is not valid with the old fmake
+DO_MAKE_BUILD?=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
 .if !target(do-build)
 do-build:
-	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} ${ALL_TARGET}; then \
+	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Compilation failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \