diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-02-05 22:51:07 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:45:25 +0000 |
| commit | 1838bd0f4839006b42d41a02a787b7f578655223 (patch) | |
| tree | 1e6252e2f95a4c151c88f6b50826d911106f8c39 /Makefile.inc1 | |
| parent | 1fd87a682ad7442327078e1eeb63edc4258f9815 (diff) | |
| parent | 1e9a9d6d056506b23ad26952df45eaac949385c7 (diff) | |
| download | src-1838bd0f4839006b42d41a02a787b7f578655223.tar.gz src-1838bd0f4839006b42d41a02a787b7f578655223.zip | |
Merge llvm-project release/14.x llvmorg-14-init-18315-g190be5457c90
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-18315-g190be5457c90.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index e3081594ec77..5aaa9a414473 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -267,14 +267,13 @@ 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/VCSVersion.inc -_WANT_LINKER_FREEBSD_VERSION!= \ - awk '$$2 == "LLD_REVISION" {gsub(/"/, "", $$3); print $$3}' \ +WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/lld/Common/Version.inc +WANT_LINKER_FREEBSD_VERSION!= \ + awk '$$2 == "LLD_FREEBSD_VERSION" {print $$3}' \ ${SRCDIR}/${WANT_LINKER_FREEBSD_VERSION_FILE} || echo unknown -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_STRING" { gsub("\"", "", $$3); 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= |