Page MenuHomeFreeBSD
Files F145968577

D11309.id29965.diff
No OneTemporary
Actions

D11309.id29965.diff
View Options

Index: share/mk/bsd.linker.mk
===================================================================
--- share/mk/bsd.linker.mk
+++ share/mk/bsd.linker.mk
@@ -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 time.
#
.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
.if ${_ld_version} == "none"
-.error Unable to determine linker type from LD=${LD}
+.error Unable to determine linker type from ${ld}=${${ld}}
.endif
.if ${_ld_version:[1..2]} == "GNU ld"
-LINKER_TYPE= binutils
+${X_}LINKER_TYPE= binutils
_v= ${_ld_version:[3]}
.elif ${_ld_version:[1]} == "LLD"
-LINKER_TYPE= lld
+${X_}LINKER_TYPE= lld
_v= ${_ld_version:[2]}
.else
-.error Unknown linker from LD=${LD}: ${_ld_version}
+.error Unknown linker from ${ld}=${${ld}}: ${_ld_version}
.endif
-LINKER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
+${X_}LINKER_VERSION!= echo "${_v:M[1-9].[0-9]*}" | \
+ awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
+.undef _ld_version
+.undef _v
+.endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
+
+.endif # ${ld} == "LD" || !empty(XLD)
+.endfor # .for ld in LD XLD
+
.endif # !target(__<bsd.linker.mk>__)

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 27, 3:09 PM (7 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29014454
Default Alt Text
D11309.id29965.diff (1 KB)

Event Timeline