From owner-svn-src-head@freebsd.org Sat Nov 7 00:56:45 2015 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 D7158A28B03; Sat, 7 Nov 2015 00:56:45 +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 BF1781F00; Sat, 7 Nov 2015 00:56:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id B8CBF1D65; Sat, 7 Nov 2015 00:56:45 +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 7A89B1231F; Sat, 7 Nov 2015 00:56:45 +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 yklVOvOek8RO; Sat, 7 Nov 2015 00:56:42 +0000 (UTC) Subject: Re: svn commit: r290417 - head DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 2FF451231A To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201511052148.tA5LmCNg042187@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <563D4C4E.2050209@FreeBSD.org> Date: Fri, 6 Nov 2015 16:56:46 -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: <201511052148.tA5LmCNg042187@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hV1GCsQx5IOReIVG5M6SfH6QHvDLxqncb" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 07 Nov 2015 00:56:45 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hV1GCsQx5IOReIVG5M6SfH6QHvDLxqncb Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/5/2015 1:48 PM, Warner Losh wrote: > -.include "share/mk/src.opts.mk" > -.include > -.include 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). > +# 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 > +.include "share/mk/src.opts.mk"=09 --=20 Regards, Bryan Drewery --hV1GCsQx5IOReIVG5M6SfH6QHvDLxqncb 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 iQEcBAEBAgAGBQJWPUxOAAoJEDXXcbtuRpfPwRgH/jrxkY7iMOOKjRHsnEkCeGCd KV+lWPTDfPmiUn7IUWYY/uHYy2wHd5oxlOjp2FOsBHxW9ZUlqAtv6wYoSkwURz0X +glVnQwRwPbnDbEckCNUAa1YIpe4JkQfWJOiLYAk8+NpPYlLqshI/WGmgIWfZGul 2YrdJPaXJP5HhQBu16LfGvZ6dvSf31B9OhWj0y37D4RLDsXlenLpARKLUy/funSE f4XQDo03BAwdTMFa4ZRNDeumiTpM0oU4kkzbZN3gfvw/xe7fjYEeYdHVEgxTvuXJ kz02BEYdMTWvaPPEINJhgQOVbAUf/WH7iD8QYXTbDpcgT06BgGoqP8jHNT24ajM= =WtpU -----END PGP SIGNATURE----- --hV1GCsQx5IOReIVG5M6SfH6QHvDLxqncb--