svn commit: r337472 - stable/11

[Bryan Drewery]

Author: bdrewery
Date: Wed Aug  8 17:50:43 2018
New Revision: 337472
URL: https://svnweb.freebsd.org/changeset/base/337472

Log:
  MFC r335244:
  
    Assert that a build is done before an install.

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Wed Aug  8 17:49:35 2018	(r337471)
+++ stable/11/Makefile.inc1	Wed Aug  8 17:50:43 2018	(r337472)
@@ -87,7 +87,10 @@ OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
 # running CC from bsd.compiler.mk.
 .if make(installworld) || make(install)
 .-include "${OBJTREE}${.CURDIR}/compiler-metadata.mk"
+.if !defined(_LOADED_COMPILER_METADATA)
+.error A build is required first.  You may have the wrong MAKEOBJDIRPREFIX set.
 .endif
+.endif
 
 # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
 .include <bsd.compiler.mk>
@@ -188,6 +191,7 @@ compiler-metadata.mk: .PHONY .META
 	@: > ${.TARGET}
 	@echo ".info Using cached compiler metadata from build at $$(hostname) on $$(date)" \
 	    > ${.TARGET}
+	@echo "_LOADED_COMPILER_METADATA=t" >> ${.TARGET}
 .for v in ${_COMPILER_METADATA_VARS}
 	@echo "${v}=${${v}}" >> ${.TARGET}
 .endfor