diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-11-19 16:40:46 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-11-19 16:40:46 +0000 |
| commit | 97900b44f6835028185268cb2e6bb19fee48f157 (patch) | |
| tree | b6539d7853c1ec8664075935cee121b00c23950f /Makefile.inc1 | |
| parent | 57c6d42784979c628330c22a44e74d9a26c380c0 (diff) | |
| download | src-test2-97900b44f6835028185268cb2e6bb19fee48f157.tar.gz src-test2-97900b44f6835028185268cb2e6bb19fee48f157.zip | |
WITH_SYSTEM_LINKER: Fix rebuilding lld every time.
This is due to LLD_REVISION_STRING being renamed to LLD_REVISION in
r351442 and the value being moved to another location in r351965.
`make test-system-linker` can be used to see the values being used here.
Reported by: ler
Notes
Notes:
svn path=/head/; revision=354859
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8dacb73369f6..7fc2c6e77f44 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -289,9 +289,9 @@ WANT_LINKER_TYPE= .if !defined(WANT_LINKER_FREEBSD_VERSION) && !make(showconfig) && \ !make(test-system-compiler) .if ${WANT_LINKER_TYPE} == "lld" -WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/lld/Common/Version.inc +WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/VCSVersion.inc WANT_LINKER_FREEBSD_VERSION!= \ - awk '$$2 == "LLD_REVISION_STRING" {gsub(/"/, "", $$3); print $$3}' \ + awk '$$2 == "LLD_REVISION" {gsub(/"/, "", $$3); print $$3}' \ ${SRCDIR}/${WANT_LINKER_FREEBSD_VERSION_FILE} || echo unknown WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc WANT_LINKER_VERSION!= \ |