On 6/23/2017 6:56 AM, Cy Schubert wrote: > In message <201706231347.v5ndlt39037...@slippy.cwsent.com>, Cy Schubert > writes: >> Let me try replying to this again. It's an exmh thing. Sorry. >> >> In message <201706222103.v5ml3oq3026...@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(__<bsd.linker.mk>__) >>> __<bsd.linker.mk>__: >>> >>> -_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). > >
Good point, but r320249 should remove the head(1) call entirely during installworld. Can you try again? -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature
