Re: pkg vs uname troubles after upgrade to 14 (lld not rebuilt issue? (X_)LINKER_FREEBSD_VERSION still 13 based?)

On 17 Feb 2021, at 04:28, Mark Millard via freebsd-current <freebsd-current_at_freebsd.org> wrote:
> 
> On 2021-Feb-16, at 15:37, Mark Millard <marklmi at yahoo.com> wrote:
>> On 2021-Feb-16, at 11:49, Brandon Bergren <bdragon at FreeBSD.org> wrote:
>>> It looks like there were recently some fixes to release.sh, that just got backported to 13. I wonder if the problem is the packages themselves being misbuilt.
>>> 
>>> https://cgit.freebsd.org/src/commit/release?h=releng/13.0&id=4689ab1eab624d1a551a5a8f109383ea18eeba20
...
> Builds that do nor force being from scratch tend to:
> 
> make[1]: "/usr/fbsd/mm-src/Makefile.inc1" line 339: SYSTEM_COMPILER: Determined that CC=cc matches the source tree.  Not bootstrapping a cross-compiler.
> make[1]: "/usr/fbsd/mm-src/Makefile.inc1" line 344: SYSTEM_LINKER: Determined that LD=ld matches the source tree.  Not bootstrapping a cross-linker.
> 
> But in my build environment, after upgrading to 14 and
> doing multiple updates as 14 has progressed, I find:
> 
> # ld -v
> LLD 11.0.1 (FreeBSD llvmorg-11.0.1-0-g43ff75f2c3fe-1300007) (compatible with GNU linkers)
> 
> Note the "1300007". This goes along with:

Ah, it looks like that wasn't bumped (though strictly, it isn't
necessary, it's more for form) in lib/clang/include/VCSVersion.inc:

% cat lib/clang/include/VCSVersion.inc
// $FreeBSD$

#define LLVM_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe"
#define LLVM_REPOSITORY "git_at_github.com:llvm/llvm-project.git"

#define CLANG_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe"
#define CLANG_REPOSITORY "git_at_github.com:llvm/llvm-project.git"

// <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
#define LLD_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe-1300007"
#define LLD_REPOSITORY "FreeBSD"

#define LLDB_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe"
#define LLDB_REPOSITORY "git_at_github.com:llvm/llvm-project.git"

-Dimitry