After the clang/llvm version 11 import LLD_VERSION is no longer used
upstream so Version.inc now only defines LLD_VERSION_STRING. This breaks the WANT_LINKER_VERSION magic and might lead to us building more than needed (e.g., for croos-tools). Change the awk script to parse LLD_VERSION_STRING instead of LLD_VERSION, which not only unbreaks the current situation but should also be backwards compatible as dim points out. PR: 248818 Reviewed by: emaste, dim (seems right and the way to go) MFC after: 4 weeks X-MFC before: 364284
This commit is contained in:
parent
f5247a232a
commit
530134d291
@ -264,7 +264,7 @@ _WANT_LINKER_FREEBSD_VERSION!= \
|
|||||||
WANT_LINKER_FREEBSD_VERSION=${_WANT_LINKER_FREEBSD_VERSION:C/.*-(.*)/\1/}
|
WANT_LINKER_FREEBSD_VERSION=${_WANT_LINKER_FREEBSD_VERSION:C/.*-(.*)/\1/}
|
||||||
WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc
|
WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc
|
||||||
WANT_LINKER_VERSION!= \
|
WANT_LINKER_VERSION!= \
|
||||||
awk '$$2 == "LLD_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
|
awk '$$2 == "LLD_VERSION_STRING" { gsub("\"", "", $$3); split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
|
||||||
${SRCDIR}/${WANT_LINKER_VERSION_FILE} || echo unknown
|
${SRCDIR}/${WANT_LINKER_VERSION_FILE} || echo unknown
|
||||||
.else
|
.else
|
||||||
WANT_LINKER_FREEBSD_VERSION_FILE=
|
WANT_LINKER_FREEBSD_VERSION_FILE=
|
||||||
|
Loading…
Reference in New Issue
Block a user