diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-04-28 17:54:45 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-04-28 17:54:45 +0000 |
| commit | 959a635039d710e2eba2509f8d7f76d2232e237e (patch) | |
| tree | 4ec69980145632ac68dd342c1ddc33166a931558 | |
| parent | fa074dda32dab51cace8f8a06d00192dd8dcfdaa (diff) | |
| download | FreeBSD-src-959a635039d710e2eba2509f8d7f76d2232e237e.zip FreeBSD-src-959a635039d710e2eba2509f8d7f76d2232e237e.tar.gz | |
MFC r316586:
META_MODE: Fix build-tools still sometimes rebuilding during target build.
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | Makefile.libcompat | 2 | ||||
| -rw-r--r-- | share/mk/bsd.crunchgen.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index e24aa54..ee4bd19 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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:${PATH} ${MAKE} ${NOFUN} 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) diff --git a/Makefile.libcompat b/Makefile.libcompat index 9fbfa07..0764c41 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -97,7 +97,7 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \ 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}" \ diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 2ac489f..11c07bc 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -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. |
