aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2020-08-21 22:31:45 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2020-08-21 22:31:45 +0000
commit530134d2918e3f8d53cf51b89c0f4c5fd032c88b (patch)
tree34437837a5ba785aba00b99028bcaa1724f71a02 /Makefile.inc1
parentf5247a232a337c93c690068930f25503d4dab8e1 (diff)
downloadsrc-530134d2918e3f8d53cf51b89c0f4c5fd032c88b.tar.gz
src-530134d2918e3f8d53cf51b89c0f4c5fd032c88b.zip
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
Notes
Notes: svn path=/head/; revision=364466
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 9223123b1e1b..77056c305ae5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -264,7 +264,7 @@ _WANT_LINKER_FREEBSD_VERSION!= \
WANT_LINKER_FREEBSD_VERSION=${_WANT_LINKER_FREEBSD_VERSION:C/.*-(.*)/\1/}
WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc
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
.else
WANT_LINKER_FREEBSD_VERSION_FILE=