From owner-svn-src-head@freebsd.org Fri Jun 23 14:00:46 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 74CE0DA5404; Fri, 23 Jun 2017 14:00:46 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (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 28D2D1B09; Fri, 23 Jun 2017 14:00:45 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id OP67dgaS8eQWUOP68dQeSA; Fri, 23 Jun 2017 07:58:08 -0600 X-Authority-Analysis: v=2.2 cv=UpATD64B c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=LWSFodeU3zMA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=tpqOzRr5eYGDGepGtMUA:9 a=CjuIK1q_8ugA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 0F5E8B6; Fri, 23 Jun 2017 06:58:07 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v5NDujRH002025; Fri, 23 Jun 2017 06:56:45 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201706231356.v5NDujRH002025@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: Cy Schubert cc: Bryan Drewery , 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 Cy Schubert of "Fri, 23 Jun 2017 06:47:55 -0700." <201706231347.v5NDlt39037415@slippy.cwsent.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 23 Jun 2017 06:56:45 -0700 X-CMAE-Envelope: MS4wfETKNpRVFs1u8DzrFJ8IFYl3SmF2M5N8TjTlKHlbwMsl5zsBcTv4aImuDRfIdhPuGLrCSTGF3k5twypDZTdrvNZOktlGRXNpjJuf+pi1sbyHNib1hT0Y FuOf7HEK95gvSDNIPfw6wdCotv+phv/eFj4M5F8JSm52I4dncrq+a3EORoJ8eOCaKPZjEOmKjm+A8jl5QJnDtcyCjbgXSQtYZqsSmTwJi7rt2qXGz+zJiDC5 0a4FqTyD5CpSaYLGQu2UZCfHtjZnqmy0CgMQ0S7Ei0enQASEBuu1bFxJH0cVyBZf 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: Fri, 23 Jun 2017 14:00:46 -0000 In message <201706231347.v5NDlt39037415@slippy.cwsent.com>, Cy Schubert writes: > Let me try replying to this again. It's an exmh thing. Sorry. > > In message <201706222103.v5ML3Oq3026557@repo.freebsd.org>, Bryan Drewery > 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. > > > > This is similar to r300350 for bsd.compiler.mk. > > > > 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 > > =========================================================================== > == > > = > > --- 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 > ti > > me. > > # > > > > .if !target(____) > > ____: > > > > -_ld_version!= ${LD} --version 2>/dev/null | head -n 1 || echo none > > +.for ld X_ in LD $${_empty_var_} XLD X_ > > +.if ${ld} == "LD" || !empty(XLD) > > +.if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD}) > > + > > +_ld_version!= ${${ld}} --version 2>/dev/null | head -n 1 || echo none > > 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 > determine linker type from LD=ld > *** Error code 1 > > Specifying the full pathname for head resolves the isssue. Or better yet, use include head in the build tools (or use sed or awk). -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.