From owner-svn-src-head@FreeBSD.ORG Sun Jul 7 17:12:47 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0DF1B1AE for ; Sun, 7 Jul 2013 17:12:47 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ie0-f177.google.com (mail-ie0-f177.google.com [209.85.223.177]) by mx1.freebsd.org (Postfix) with ESMTP id CFC141C86 for ; Sun, 7 Jul 2013 17:12:46 +0000 (UTC) Received: by mail-ie0-f177.google.com with SMTP id aq17so7998450iec.8 for ; Sun, 07 Jul 2013 10:12:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=f5KJRwtK4EF/MJZGk8R30PA7gbAbJenkocR58VGPdPo=; b=mO8K5AkFrYRafQJi/Va2IT533qXkUYcpHIKTFHeQVC1BJsZIZXq/dL4oecz5LX53R0 F8/F7PWbxV/1manJgbZ46+GIFKpw5OzRNNRiNrtqcV7Nla6dcnO0VC2vZApjMyNvmf7N AusC9TX/jTc5KmXTIgn1pRfbcKW//YHcT/jQOLl8M4JLONl4Ep352qFOA+ibrQLbeHS9 ODrF7qB4OwzW1yEoerMh95q5+ZKTlaKucMIxE978/JPDrHCLej72+7REjkVdl06PJKpI 0x+0KaX5N3sCNliuYAddVmNqbZJyWnmBQMkLTJHuMzfCiplJIEHeG+npl9e88P1wGEe6 ktJw== X-Received: by 10.50.79.169 with SMTP id k9mr31973136igx.20.1373217160461; Sun, 07 Jul 2013 10:12:40 -0700 (PDT) Received: from 53.imp.bsdimp.com (50-78-194-198-static.hfc.comcastbusiness.net. [50.78.194.198]) by mx.google.com with ESMTPSA id q10sm7773075ige.4.2013.07.07.10.12.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Jul 2013 10:12:39 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r252856 - head Mime-Version: 1.0 (Apple Message framework v1085) Content-Type: text/plain; charset=us-ascii From: Warner Losh In-Reply-To: <201307060013.r660D8bg037291@svn.freebsd.org> Date: Sun, 7 Jul 2013 11:12:36 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201307060013.r660D8bg037291@svn.freebsd.org> To: Simon J. Gerraty X-Mailer: Apple Mail (2.1085) X-Gm-Message-State: ALoCoQn/wZUn5HldLGQSekpABlxq8AdmN2k6Sy2C96SNrrXk9GKNa889Wx1bPwQ0ywIU43frc2xW Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jul 2013 17:12:47 -0000 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}; \