d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't overwrite already-set LINKER_VERSION/LINKER_TYPE.

Browse Source 
MFC after:	2 weeks
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-06-22 22:53:07 +00:00
parent 89bf31fd63
commit ec39013eb2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/mk/bsd.linker.mk
View File

@ -41,7 +41,7 @@ ${var}= ${${var}.${${X_}_ld_hash}}
.endif .endif
.if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD}) .if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
.if !defined(${X_}LINKER_TYPE) || !defined(${X_}LINKER_VERSION)
_ld_version!= ${${ld}} --version 2>/dev/null | head -n 1 || echo none _ld_version!= ${${ld}} --version 2>/dev/null | head -n 1 || echo none
.if ${_ld_version} == "none" .if ${_ld_version} == "none"
.error Unable to determine linker type from ${ld}=${${ld}} .error Unable to determine linker type from ${ld}=${${ld}}
@ -59,6 +59,7 @@ ${X_}LINKER_VERSION!= echo "${_v:M[1-9].[0-9]*}" | \
awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
.undef _ld_version .undef _ld_version
.undef _v .undef _v
.endif
.endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD}) .endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
# Export the values so sub-makes don't have to look them up again, using the # Export the values so sub-makes don't have to look them up again, using the