From owner-svn-src-head@freebsd.org Mon Jul 24 19:14:25 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 509DDD7DEA0; Mon, 24 Jul 2017 19:14:25 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 097D37530F; Mon, 24 Jul 2017 19:14:24 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:470:7a58::c995:48cf:5934:883a] (unknown [IPv6:2001:470:7a58:0:c995:48cf:5934:883a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id BCF50262C4; Mon, 24 Jul 2017 21:14:17 +0200 (CEST) From: Dimitry Andric Message-Id: <2EB128F7-BBFB-4BCC-87FF-BE416D461994@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_D96225B1-FCD2-4DDD-9A7C-656326D615F3"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: svn commit: r321433 - head Date: Mon, 24 Jul 2017 21:14:12 +0200 In-Reply-To: <2fba04e9-520b-d36d-b038-25fe694724fb@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: Bryan Drewery References: <201707241852.v6OIqe3F041498@repo.freebsd.org> <2fba04e9-520b-d36d-b038-25fe694724fb@FreeBSD.org> X-Mailer: Apple Mail (2.3273) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 24 Jul 2017 19:14:25 -0000 --Apple-Mail=_D96225B1-FCD2-4DDD-9A7C-656326D615F3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 24 Jul 2017, at 21:04, Bryan Drewery wrote: >=20 > On 7/24/2017 11:52 AM, Dimitry Andric wrote: >> Author: dim >> Date: Mon Jul 24 18:52:40 2017 >> New Revision: 321433 >> URL: https://svnweb.freebsd.org/changeset/base/321433 >>=20 >> Log: >> Cleanup stale Options.inc files from the previous libllvm build for >> clang 4.0.0. Otherwise, these can get included before the two newly >> generated ones (which are different) for clang 5.0.0. >>=20 >> Reported by: Mark Millard >> MFC after: 2 months >> X-MFC-With: r321369 >>=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 Mon Jul 24 18:25:08 2017 = (r321432) >> +++ head/Makefile.inc1 Mon Jul 24 18:52:40 2017 = (r321433) >> @@ -813,6 +813,16 @@ _worldtmp: .PHONY >> = ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.* >> .endif >> .endfor >> +# 20170724 remove stale lib/clang/libllvm/Options.inc file, of which = there are >> +# two different versions after r308421, one for llvm-lib, one for = llvm-dlltool >> +.for d in ${OBJTREE} ${WORLDTMP} >> +.for f in ${d}${.CURDIR}/lib/clang/libllvm/Options.inc >=20 > The 2nd .for is not needed, there's only 1 item. It could probably be > f=3D${d}${.CURDIR}/lib/clang/libllvm/Options.inc instead. I never fully understand how assignments work in bmake, this always goes wrong for me in for loops. Feel free to correct it so that it works, I'm afraid to touch this. :) -Dimitry --Apple-Mail=_D96225B1-FCD2-4DDD-9A7C-656326D615F3 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.1 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCWXZHBAAKCRCwXqMKLiCW oxnkAKDUzuDIOjipWs4s7XPDfBNH5/dSxQCfdX8Us1N7h4Rpyru7qLdLURNDcsc= =DKVx -----END PGP SIGNATURE----- --Apple-Mail=_D96225B1-FCD2-4DDD-9A7C-656326D615F3--