Date: Sun, 7 Jul 2013 11:12:36 -0600 From: Warner Losh <imp@bsdimp.com> To: Simon J. Gerraty <sjg@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r252856 - head Message-ID: <D5B34BB4-2B19-4F87-A5C1-566B8CFF68DA@bsdimp.com> In-Reply-To: <201307060013.r660D8bg037291@svn.freebsd.org> References: <201307060013.r660D8bg037291@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Doesn't .MAKE break the update path? Warner On Jul 5, 2013, at 6:13 PM, Simon J. Gerraty wrote: > Author: sjg > Date: Sat Jul 6 00:13:08 2013 > New Revision: 252856 > URL: http://svnweb.freebsd.org/changeset/base/252856 >=20 > Log: > Sprinkle some .MAKE magic >=20 > Modified: > head/Makefile.inc1 >=20 > Modified: head/Makefile.inc1 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/Makefile.inc1 Sat Jul 6 00:10:52 2013 = (r252855) > +++ head/Makefile.inc1 Sat Jul 6 00:13:08 2013 = (r252856) > @@ -1237,7 +1237,7 @@ _kerberos5_bootstrap_tools=3D \ > # Please document (add comment) why something is in = 'bootstrap-tools'. > # Try to bound the building of the bootstrap-tool to just the > # FreeBSD versions that need the tool built at this stage of the = build. > -bootstrap-tools: > +bootstrap-tools: .MAKE > .for _tool in \ > ${_clang_tblgen} \ > ${_kerberos5_bootstrap_tools} \ > @@ -1290,7 +1290,7 @@ _gcc_tools=3D gnu/usr.bin/cc/cc_tools > _rescue=3D rescue/rescue > .endif >=20 > -build-tools: > +build-tools: .MAKE > .for _tool in \ > bin/csh \ > bin/sh \ > @@ -1352,7 +1352,7 @@ _cc=3D gnu/usr.bin/cc > .endif > .endif >=20 > -cross-tools: > +cross-tools: .MAKE > .for _tool in \ > ${_clang_libs} \ > ${_clang} \ > @@ -1383,12 +1383,12 @@ hierarchy hier: > # interdependencies (__L) are built automatically by the > # ${.CURDIR}/tools/make_libdeps.sh script. > # > -libraries: > - cd ${.CURDIR}; \ > - ${MAKE} -f Makefile.inc1 _prereq_libs; \ > - ${MAKE} -f Makefile.inc1 _startup_libs; \ > - ${MAKE} -f Makefile.inc1 _prebuild_libs; \ > - ${MAKE} -f Makefile.inc1 _generic_libs; > +libraries: .MAKE > + cd ${.CURDIR} && \ > + ${MAKE} -f Makefile.inc1 _prereq_libs && \ > + ${MAKE} -f Makefile.inc1 _startup_libs && \ > + ${MAKE} -f Makefile.inc1 _prebuild_libs && \ > + ${MAKE} -f Makefile.inc1 _generic_libs >=20 > # > # static libgcc.a prerequisite for shared libc > @@ -1542,7 +1542,7 @@ lib/libradius__L: lib/libmd__L > .endif >=20 > .for _lib in ${_prereq_libs} > -${_lib}__PL: .PHONY > +${_lib}__PL: .PHONY .MAKE > .if exists(${.CURDIR}/${_lib}) > ${_+_}@${ECHODIR} "=3D=3D=3D> ${_lib} (obj,depend,all,install)"; = \ > cd ${.CURDIR}/${_lib} && \ > @@ -1554,7 +1554,7 @@ ${_lib}__PL: .PHONY > .endfor >=20 > .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} = ${_generic_libs} > -${_lib}__L: .PHONY > +${_lib}__L: .PHONY .MAKE > .if exists(${.CURDIR}/${_lib}) > ${_+_}@${ECHODIR} "=3D=3D=3D> ${_lib} (obj,depend,all,install)"; = \ > cd ${.CURDIR}/${_lib} && \ > @@ -1568,7 +1568,7 @@ ${_lib}__L: .PHONY > # libpam is special: we need to build static PAM modules before > # static PAM library, and dynamic PAM library before dynamic PAM > # modules. > -lib/libpam__L: .PHONY > +lib/libpam__L: .PHONY .MAKE > ${_+_}@${ECHODIR} "=3D=3D=3D> lib/libpam = (obj,depend,all,install)"; \ > cd ${.CURDIR}/lib/libpam && \ > ${MAKE} DIRPRFX=3Dlib/libpam/ obj && \ > @@ -1583,7 +1583,7 @@ _generic_libs: ${_generic_libs:S/$/__L/} >=20 > .for __target in all clean cleandepend cleandir depend includes obj > .for entry in ${SUBDIR} > -${entry}.${__target}__D: .PHONY > +${entry}.${__target}__D: .PHONY .MAKE > ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; = then \ > ${ECHODIR} "=3D=3D=3D> = ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ > edir=3D${entry}.${MACHINE_ARCH}; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D5B34BB4-2B19-4F87-A5C1-566B8CFF68DA>