svn commit: r365416 - stable/12

[Bjoern A. Zeeb]

Author: bz
Date: Mon Sep  7 14:22:27 2020
New Revision: 365416
URL: https://svnweb.freebsd.org/changeset/base/365416

Log:
  MFC r364466:
  
    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.
  
    Merging this before r364284 will ensure that stable/12 won't break.
  
    PR:		248818
    Reviewed by:	emaste, dim (seems right and the way to go)

Modified:
  stable/12/Makefile.inc1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1	Mon Sep  7 13:44:54 2020	(r365415)
+++ stable/12/Makefile.inc1	Mon Sep  7 14:22:27 2020	(r365416)
@@ -286,7 +286,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=