svn commit: r320245 - head/share/mk

[Cy Schubert]

In message <201706240335.v5O3ZTtG084871 at slippy.cwsent.com>, Cy Schubert 
writes:
> In message <dd1a2610-c57d-a54d-734b-293a80e16997 at FreeBSD.org>, 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 <bdrewery at FreeBSD.org>
> > To: Cy Schubert <Cy.Schubert at komquats.com>
> > Cc: src-committers at freebsd.org, svn-src-all at freebsd.org,
> >  svn-src-head at freebsd.org
> > Message-ID: <dd1a2610-c57d-a54d-734b-293a80e16997 at FreeBSD.org>
> > Subject: Re: svn commit: r320245 - head/share/mk
> > References: <201706231356.v5NDujRH002025 at slippy.cwsent.com>
> > In-Reply-To: <201706231356.v5NDujRH002025 at 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 at slippy.cwsent.com>, Cy Schubert=
> > =20
> > > writes:
> > >> Let me try replying to this again. It's an exmh thing. Sorry.
> > >>
> > >> In message <201706222103.v5ML3Oq3026557 at 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(__<bsd.linker.mk>__)
> > >>>  __<bsd.linker.mk>__:
> > >>> =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 || e
> cho 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.

It's good. Install to amd64 and i386 was successful.

Thanks for fixing this.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.