From owner-svn-src-all@freebsd.org Sat Nov 7 01:00:53 2015 Return-Path: Delivered-To: svn-src-all@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 5C64BA28B82; Sat, 7 Nov 2015 01:00:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 441911131; Sat, 7 Nov 2015 01:00:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 3DAB51EF7; Sat, 7 Nov 2015 01:00:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id F001D1232E; Sat, 7 Nov 2015 01:00:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id tunz_5T0uFkJ; Sat, 7 Nov 2015 01:00:46 +0000 (UTC) Subject: Re: svn commit: r290417 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com E522912326 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201511052148.tA5LmCNg042187@repo.freebsd.org> <563D4C4E.2050209@FreeBSD.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <563D4D44.10109@FreeBSD.org> Date: Fri, 6 Nov 2015 17:00:52 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <563D4C4E.2050209@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="G7xMdQ8uaMP6tmxOKvSEB828DgsvOqcDj" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 01:00:53 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --G7xMdQ8uaMP6tmxOKvSEB828DgsvOqcDj Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/6/2015 4:56 PM, Bryan Drewery wrote: > On 11/5/2015 1:48 PM, Warner Losh wrote: >> -.include "share/mk/src.opts.mk" >> -.include >> -.include >=20 > Fun fact, src.opts.mk is already including bsd.compiler.mk so it being > here is redundant (since r263953 removed direct checks in > COMPILER_TYPE/VERSION). >=20 >> +# Cross toolchain changes must be in effect before bsd.compiler.mk >> +# so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. >> +.if defined(CROSS_TOOLCHAIN) >> +LOCALBASE?=3D /usr/local >> +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" >> +CROSSENV+=3DCROSS_TOOLCHAIN=3D"${CROSS_TOOLCHAIN}" >> +.endif >> +.include # don't depend on src.opts.mk doing it That explains this comment. It was obscure to me. >> +.include "share/mk/src.opts.mk"=09 >=20 >=20 --=20 Regards, Bryan Drewery --G7xMdQ8uaMP6tmxOKvSEB828DgsvOqcDj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWPU1EAAoJEDXXcbtuRpfPfX0H/R/PrNpDUkr86UMRhxCHWFK0 1MJQeEZ3DVDDITUfNEQas32uqFqvuzZCfh5d1WotaQXoGHxW1d6Oan8Ez5gtY+03 SMfDHTtBqGR5mF4jHxPApmu6YY4OGL4WuRGrymOZlYN3PDIA8VjZYFg3QfKm2Z07 R44cASlH6/J9vsMggWCMeNfqOQPq0i+uXwg4M1QbW81jDGdKZ5jK2j8w2DfKuZdT tj3tLXatPJd66fYH2DljZDV08e1CRYEhMczrrVcOaxwDsON20cNGegCIBb1o7PFN yJtLfkJif2IyF15nB9+KL09NIKqUGT8hjCN76hBu+IszC8rW4tZN/fiZu1qwA1A= =U8nt -----END PGP SIGNATURE----- --G7xMdQ8uaMP6tmxOKvSEB828DgsvOqcDj--