From owner-svn-src-head@freebsd.org Sat Jun 24 04:05:05 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 2BE40D9610E; Sat, 24 Jun 2017 04:05:05 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id CFCE281463; Sat, 24 Jun 2017 04:05:04 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id OcJbdGvSEM9gtOcJcdvOZC; Fri, 23 Jun 2017 22:04:57 -0600 X-Authority-Analysis: v=2.2 cv=a+JAzQaF c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=LWSFodeU3zMA:10 a=6I5d2MoRAAAA:8 a=BWvPGDcYAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=nFYkoIQbuwSpul8FLbkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=pxhY87DP9d2VeQe4joPk:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 7885B2C4; Fri, 23 Jun 2017 21:04:55 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v5O3ZTtG084871; Fri, 23 Jun 2017 20:35:29 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201706240335.v5O3ZTtG084871@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Bryan Drewery cc: Cy Schubert , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r320245 - head/share/mk In-Reply-To: Message from Bryan Drewery of "Fri, 23 Jun 2017 08:42:41 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 23 Jun 2017 20:35:29 -0700 X-CMAE-Envelope: MS4wfN6xz08SzpmqvZs/TGQpjjBzg5yvfhZScwDvr8wPL/qnevtd6IBdzKaoUuZM4nhtm2wEwfsAwL0qK8wObBJzmt27GDEbCRqwX+XVOo7W30aoSvXm0QU1 H1XTXAOZEp+pChnCnbcnUXj2KX/l9WgImzRqC9ROv9Ptcp/ur36N+oqmOHo3niDcpAmoJF5w2w+T/5Ws0tUcJnMVzsdHiz6VTFd/BNNG9y81RpGDh7sXPcmV JV3810XxOc35CZ37bcfJklucRzIF19UTOvNCPO0IPu0GhHkL0mqy22zJE1s3bMO/ 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: Sat, 24 Jun 2017 04:05:05 -0000 In message , Bryan Drewery wr ites: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --wgtDeWvwHi0cSQFVbm1oqMHHag11O62n3 > Content-Type: multipart/mixed; boundary="77famXCJfxNoDslk4Jg33FDxFgUd929a1"; > protected-headers="v1" > From: Bryan Drewery > To: Cy Schubert > Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, > svn-src-head@freebsd.org > Message-ID: > Subject: Re: svn commit: r320245 - head/share/mk > References: <201706231356.v5NDujRH002025@slippy.cwsent.com> > In-Reply-To: <201706231356.v5NDujRH002025@slippy.cwsent.com> > > --77famXCJfxNoDslk4Jg33FDxFgUd929a1 > Content-Type: text/plain; charset=utf-8 > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > On 6/23/2017 6:56 AM, Cy Schubert wrote: > > In message <201706231347.v5NDlt39037415@slippy.cwsent.com>, Cy Schubert= > =20 > > writes: > >> Let me try replying to this again. It's an exmh thing. Sorry. > >> > >> In message <201706222103.v5ML3Oq3026557@repo.freebsd.org>, Bryan Drewe= > ry=20 > >> writes > >> : > >>> Author: bdrewery > >>> Date: Thu Jun 22 21:03:24 2017 > >>> New Revision: 320245 > >>> URL: https://svnweb.freebsd.org/changeset/base/320245 > >>> > >>> Log: > >>> Support XLD for setting X_LINKER_TYPE and X_LINKER_VERSION. > >>> =20 > >>> This is similar to r300350 for bsd.compiler.mk. > >>> =20 > >>> MFC after: 2 weeks > >>> Reviewed by: emaste > >>> Sponsored by: Dell EMC Isilon > >>> Differential Revision: https://reviews.freebsd.org/D11309 > >>> > >>> Modified: > >>> head/share/mk/bsd.linker.mk > >>> > >>> Modified: head/share/mk/bsd.linker.mk > >>> =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/share/mk/bsd.linker.mk Thu Jun 22 21:03:20 2017 (r32024 > >>> 4) > >>> +++ head/share/mk/bsd.linker.mk Thu Jun 22 21:03:24 2017 (r32024 > >>> 5) > >>> @@ -9,25 +9,39 @@ > >>> # major * 10000 + minor * 100 + tiny > >>> # It too can be overridden on the command line. > >>> # > >>> +# These variables with an X_ prefix will also be provided if XLD is = > set. > >>> +# > >>> # This file may be included multiple times, but only has effect the = > first=20 > >> ti > >>> me. > >>> # > >>> =20 > >>> .if !target(____) > >>> ____: > >>> =20 > >>> -_ld_version!=3D ${LD} --version 2>/dev/null | head -n 1 || echo none= > > >>> +.for ld X_ in LD $${_empty_var_} XLD X_ > >>> +.if ${ld} =3D=3D "LD" || !empty(XLD) > >>> +.if ${ld} =3D=3D "LD" || (${ld} =3D=3D "XLD" && ${XLD} !=3D ${LD}) > >>> + > >>> +_ld_version!=3D ${${ld}} --version 2>/dev/null | head -n 1 || echo n= > one > >> > >> This line gave one of my machines a bit of gas with the error: > >> > >> sh: head: not found > >> make[2]: "/opt/src/svn-current/share/mk/bsd.linker.mk" line 42: Unable= > to=20 > >> determine linker type from LD=3Dld > >> *** Error code 1 > >> > >> Specifying the full pathname for head resolves the isssue. > >=20 > > Or better yet, use include head in the build tools (or use sed or awk).= > > >=20 > >=20 > > Good point, but r320249 should remove the head(1) call entirely during > installworld. Can you try again? It's building now. I'll let you know when it's done. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.