Date: Fri, 15 Jun 2018 21:36:33 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r335244 - head Message-ID: <201806160436.w5G4aXks039566@slippy.cwsent.com> In-Reply-To: Message from Bryan Drewery <bdrewery@FreeBSD.org> of "Sat, 16 Jun 2018 00:35:19 -0000." <201806160035.w5G0ZJfd066325@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <201806160035.w5G0ZJfd066325@repo.freebsd.org>, Bryan Drewery writes : > Author: bdrewery > Date: Sat Jun 16 00:35:19 2018 > New Revision: 335244 > URL: https://svnweb.freebsd.org/changeset/base/335244 > > Log: > Assert that a build is done before an install. > > This should also catch cases where the wrong MAKEOBJDIRPREFIX is used for > install. > > MFC after: 2 weeks > Sponsored by: Dell EMC > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================= > = > --- head/Makefile.inc1 Fri Jun 15 23:42:22 2018 (r335243) > +++ head/Makefile.inc1 Sat Jun 16 00:35:19 2018 (r335244) > @@ -89,7 +89,10 @@ MK_GCC_BOOTSTRAP= no > .if make(installworld) || make(install) || make(distributeworld) || \ > make(stageworld) > .-include "${OBJTOP}/compiler-metadata.mk" > +.if !defined(_LOADED_COMPILER_METADATA) > +.error A build is required first. You may have the wrong MAKEOBJDIRPREFIX s > et. > .endif > +.endif > > # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. Pull it from the > # tree to be friendlier to foreign OS builds. It's safe to do so uncondition > ally > @@ -195,6 +198,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 > Another data point: This also broke the following: cwsys# poudriere jail -c -m src=/opt/src/svn-current -j HEADi386 -a i386 [00:00:00] Creating HEADi386 fs at /poudriere/amd64/jails/HEADi386... done [00:00:01] Copying /opt/src/svn-current to /poudriere/amd64/jails/HEADi3 86/usr/src... done [00:06:01] Starting make installworld --- installworld --- make[1]: "/export/obj/opt/src/svn-current/i386.i386/compiler-metadata.mk " line 1: Using cached compiler metadata from build at cwsys on Fri Jun 15 18:39:46 PDT 2018 make[1]: "/opt/src/svn-current/Makefile.inc1" line 93: A build is required first. You may have the wrong MAKEOBJDIRPREFIX set. *** [installworld] Error code 1 make: stopped in /opt/src/svn-current 1 error make: stopped in /opt/src/svn-current [00:06:01] Error: Failed to 'make installworld' [00:06:01] Error while creating jail, cleaning up. [00:06:01] Removing HEADi386 jail... done [00:06:03] Cleaning HEADi386 data... done cwsys# -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806160436.w5G4aXks039566>