Date: Fri, 28 Apr 2017 17:54:45 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r317562 - in stable/11: . share/mk Message-ID: <201704281754.v3SHsjT9076872@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Apr 28 17:54:45 2017 New Revision: 317562 URL: https://svnweb.freebsd.org/changeset/base/317562 Log: MFC r316586: META_MODE: Fix build-tools still sometimes rebuilding during target build. Modified: stable/11/Makefile.inc1 stable/11/Makefile.libcompat stable/11/share/mk/bsd.crunchgen.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Fri Apr 28 16:42:52 2017 (r317561) +++ stable/11/Makefile.inc1 Fri Apr 28 17:54:45 2017 (r317562) @@ -459,7 +459,7 @@ CROSSENV+= MAKEOBJDIRPREFIX=${OBJTREE} \ CPUTYPE=${TARGET_CPUTYPE} .if ${MK_META_MODE} != "no" # Don't rebuild build-tools targets during normal build. -CROSSENV+= BUILD_TOOLS_META=.NOMETA_CMP +CROSSENV+= BUILD_TOOLS_META=.NOMETA .endif .if ${MK_GROFF} != "no" CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ @@ -2496,7 +2496,7 @@ CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} .if ${MK_META_MODE} != "no" # Don't rebuild build-tools targets during normal build. -CD2MAKE+= BUILD_TOOLS_META=.NOMETA_CMP +CD2MAKE+= BUILD_TOOLS_META=.NOMETA .endif XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) Modified: stable/11/Makefile.libcompat ============================================================================== --- stable/11/Makefile.libcompat Fri Apr 28 16:42:52 2017 (r317561) +++ stable/11/Makefile.libcompat Fri Apr 28 17:54:45 2017 (r317562) @@ -97,7 +97,7 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${L DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}" .if ${MK_META_MODE} != "no" # Don't rebuild build-tools targets during normal build. -LIBCOMPATWMAKEENV+= BUILD_TOOLS_META=.NOMETA_CMP +LIBCOMPATWMAKEENV+= BUILD_TOOLS_META=.NOMETA .endif LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ CXX="${XCXX} ${LIBCOMPATCXXFLAGS} ${LIBCOMPATCFLAGS}" \ Modified: stable/11/share/mk/bsd.crunchgen.mk ============================================================================== --- stable/11/share/mk/bsd.crunchgen.mk Fri Apr 28 16:42:52 2017 (r317561) +++ stable/11/share/mk/bsd.crunchgen.mk Fri Apr 28 17:54:45 2017 (r317562) @@ -133,7 +133,7 @@ ${PROG}: ${OUTPUTS} objs .NOMETA .PHONY objs: ${OUTMK} .META ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ - ${MAKE} -f ${OUTMK} BUILD_TOOLS_META=.NOMETA_CMP objs + ${MAKE} -f ${OUTMK} BUILD_TOOLS_META=.NOMETA objs # <sigh> Someone should replace the bin/csh and bin/sh build-tools with # shell scripts so we can remove this nonsense.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704281754.v3SHsjT9076872>