[Bug 248818] clang11 import breaks WANT_LINKER_VERSION check forcing extra cross-tools to be built

bugzilla-noreply at freebsd.org bugzilla-noreply at freebsd.org
Fri Aug 21 21:49:58 UTC 2020


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248818

            Bug ID: 248818
           Summary: clang11 import breaks WANT_LINKER_VERSION check
                    forcing extra cross-tools to be built
           Product: Base System
           Version: CURRENT
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Many People
          Priority: ---
         Component: misc
          Assignee: toolchain at FreeBSD.org
          Reporter: bz at FreeBSD.org
                CC: dim at FreeBSD.org, emaste at freebsd.org,
                    jhb-bugs at FreeBSD.org

Hi,

the clang11 import changed the #defines in Version.inc for lld; see:

https://svnweb.freebsd.org/base/head/lib/clang/include/lld/Common/Version.inc?r1=361410&r2=364284


This makes the Makefile.inc1 WANT_LINKER_VERSION check to fail (becomes empty).

I don't know if changing the Version.inc back to have the other #defines is the
right solution or to change the check in Makefile.inc1.  The latter done as
follows does fix the later checks and we do not built cross-tools lib/clang/*
anymore for LLD:

Index: Makefile.inc1
===================================================================
--- Makefile.inc1       (revision 364456)
+++ Makefile.inc1       (working copy)
@@ -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=

-- 
You are receiving this mail because:
You are the assignee for the bug.


More information about the freebsd-toolchain mailing list