Date: Fri, 23 Jun 2017 08:42:41 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r320245 - head/share/mk Message-ID: <dd1a2610-c57d-a54d-734b-293a80e16997@FreeBSD.org> In-Reply-To: <201706231356.v5NDujRH002025@slippy.cwsent.com> References: <201706231356.v5NDujRH002025@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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@FreeBSD.org> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <dd1a2610-c57d-a54d-734b-293a80e16997@FreeBSD.org> 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(__<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 || 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? --=20 Regards, Bryan Drewery --77famXCJfxNoDslk4Jg33FDxFgUd929a1-- --wgtDeWvwHi0cSQFVbm1oqMHHag11O62n3 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 iQEcBAEBAgAGBQJZTTbxAAoJEDXXcbtuRpfPp8cH/AtRKy9Mmx2V8uo3fJjKrV+K 3t9NyvPfzz0XXR4m/HXCIJzDZOpYNkdVWQlAYvQP2J/Uq+klttermehRYYsyvqvb lmJWwNuVYlUlQsnpPXPhILdFfSRGrHgxjDCWiVQQ4SlzGIQkwSIeJCGNC3idxPq/ h/JtY5BQCF7JIweY9xB5VU5uURp28Wioxhydvf9Ej/6ME1zaQyeajLsMMUJtZgrO KSmesQei7viFXs6VLdOBcAfR/uSYZlBnL/9NNUEo//uIC//JWYVpdgr4lnIZHwaT rIzmOXM41dj6LS10mA7v+0N0yCExiUbwCGAtacvRXkZGGtJ3+ECCAYe8GG2mgWA= =4zps -----END PGP SIGNATURE----- --wgtDeWvwHi0cSQFVbm1oqMHHag11O62n3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?dd1a2610-c57d-a54d-734b-293a80e16997>