Failed to update from sources 13.2 -> 13.3

I would like to do a minor update from sources, from version 13.2 to 13.3.
I've got the required sources and tried to build world:
# make buildworld
Got the following errors:
Code:
make[1]: "/usr/src/Makefile.inc1" line 339: SYSTEM_COMPILER: libclang will be built for bootstrapping a cross-compiler.
make[1]: "/usr/src/Makefile.inc1" line 344: SYSTEM_LINKER: libclang will be built for bootstrapping a cross-linker.
--------------------------------------------------------------
>>> World build started on Thu Jul 18 15:28:48 2024
--------------------------------------------------------------

--------------------------------------------------------------
>>> Rebuilding the temporary build tree
--------------------------------------------------------------
rm -rf /usr/obj/usr/src/amd64.amd64/tmp
cd /usr/src/tools/build;  make DIRPRFX=tools/build/ DESTDIR=/usr/obj/usr/src/amd64.amd64/tmp/legacy installdirs
mkdir -p /usr/obj/usr/src/amd64.amd64/tmp/legacy/bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/lib/casper /usr/obj/usr/src/amd64.amd64/tmp/legacy/lib/geom /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/casper /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/private/ucl /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/private/zstd /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/lib /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libdata/pkgconfig /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libexec
ln -sfn bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/sbin
ln -sfn ../bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/bin
ln -sfn ../bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/sbin
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/sys"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/casper"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/ufs/ufs"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/ufs/ffs"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/fs/msdosfs"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/sys/disk"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/machine"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/rpc"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/crypto/chacha20"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/x86"
cd /usr/src/tools/build;  make DIRPRFX=tools/build/ DESTDIR=/usr/obj/usr/src/amd64.amd64/tmp/legacy host-symlinks
Linking host tools into /usr/obj/usr/src/amd64.amd64/tmp/legacy/bin
rm -f /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libexec/flua
cp -pf /usr/libexec/flua /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libexec/flua

--------------------------------------------------------------
>>> stage 1.1: legacy release compatibility shims
--------------------------------------------------------------
cd /usr/src; INSTALL="sh /usr/src/tools/install.sh"  TOOLS_PREFIX=/usr/obj/usr/src/amd64.amd64/tmp  PATH=/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/sbin:/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/bin:/usr/obj/usr/src/amd64.amd64/tmp/legacy/bin:/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libexec:/sbin:/bin:/usr/sbin:/usr/bin  WORLDTMP=/usr/obj/usr/src/amd64.amd64/tmp  MAKEFLAGS="-m /usr/src/tools/build/mk  -m /usr/src/share/mk" make  -f Makefile.inc1  DESTDIR=  OBJTOP='/usr/obj/usr/src/amd64.amd64/tmp/obj-tools'  OBJROOT='${OBJTOP}/'  MAKEOBJDIRPREFIX=  BOOTSTRAPPING=1302001  BWPHASE=legacy  -DNO_CPU_CFLAGS  -DNO_LINT  -DNO_PIC  -DNO_SHARED  MK_CTF=no  MK_CLANG_EXTRAS=no  MK_CLANG_FORMAT=no  MK_CLANG_FULL=no  MK_HTML=no  MK_MAN=no  MK_PROFILE=no  MK_RETPOLINE=no  MK_SSP=no  MK_TESTS=no  MK_WERROR=no  MK_INCLUDES=yes  MK_MAN_UTILS=yes MK_LLVM_TARGET_ALL=no legacy
[Creating objdir /usr/obj/usr/src/amd64.amd64/tmp/obj-tools...]
===> tools/build (obj,includes,all,install)
[Creating objdir /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/tools/build...]
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/include/mpool.h /usr/src/include/ndbm.h /usr/src/include/err.h /usr/src/include/stringlist.h /usr/src/include/a.out.h /usr/src/include/nlist.h /usr/src/include/nl_types.h /usr/src/include/elf.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/sys/imgact_aout.h /usr/src/sys/sys/nlist_aout.h /usr/src/sys/sys/nv.h /usr/src/sys/sys/cnv.h /usr/src/sys/sys/dnv.h /usr/src/sys/sys/elf32.h /usr/src/sys/sys/elf64.h /usr/src/sys/sys/elf_common.h /usr/src/sys/sys/elf_generic.h /usr/src/sys/sys/queue.h /usr/src/sys/sys/md5.h /usr/src/sys/sys/sbuf.h /usr/src/sys/sys/tree.h /usr/src/sys/sys/font.h /usr/src/sys/sys/consio.h /usr/src/sys/sys/fnv_hash.h /usr/src/sys/sys/elf.h /usr/src/sys/sys/ctf.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/lib/libcasper/services/cap_fileargs/cap_fileargs.h /usr/src/lib/libcasper/services/cap_net/cap_net.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/casper/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/ufs/ufs/dinode.h /usr/src/sys/ufs/ufs/dir.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/ufs/ufs/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/ufs/ffs/fs.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/ufs/ffs/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/fs/msdosfs/bootsect.h /usr/src/sys/fs/msdosfs/bpb.h /usr/src/sys/fs/msdosfs/denode.h /usr/src/sys/fs/msdosfs/direntry.h /usr/src/sys/fs/msdosfs/fat.h /usr/src/sys/fs/msdosfs/msdosfsmount.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/fs/msdosfs/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/sys/disk/bsd.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/disk/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/amd64/include/elf.h /usr/src/sys/amd64/include/exec.h /usr/src/sys/amd64/include/reloc.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/machine/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/rpc/types.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/rpc/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/crypto/chacha20/_chacha.h /usr/src/sys/crypto/chacha20/chacha.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/crypto/chacha20/
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444  /usr/src/sys/x86/include/elf.h /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/x86/
cc  -O2 -pipe -fno-common -I/usr/src/tools/build/libc-bootstrap  -g -MD  -MF.depend.dummy.o -MTdummy.o -std=gnu99 -Wno-format-zero-length -Wsystem-headers -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Wnested-externs -Wold-style-definition -Wno-pointer-sign -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=unused-but-set-variable  -Qunused-arguments    -I/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include -c /usr/src/tools/build/dummy.c -o dummy.o
building static egacy library
ar -crsD libegacy.a dummy.o
sh /usr/src/tools/install.sh  -C -o root -g wheel -m 444   libegacy.a /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/lib/
mkdir -p /usr/obj/usr/src/amd64.amd64/tmp/legacy/bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/lib/casper /usr/obj/usr/src/amd64.amd64/tmp/legacy/lib/geom /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/casper /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/private/ucl /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/private/zstd /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/lib /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libdata/pkgconfig /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libexec
ln -sfn bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/sbin
ln -sfn ../bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/bin
ln -sfn ../bin /usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/sbin
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/sys"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/casper"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/ufs/ufs"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/ufs/ffs"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/fs/msdosfs"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/sys/disk"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/machine"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/rpc"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/crypto/chacha20"
mkdir -p "/usr/obj/usr/src/amd64.amd64/tmp/legacy//usr/include/x86"

--------------------------------------------------------------
>>> stage 1.2: bootstrap tools
--------------------------------------------------------------
cd /usr/src; INSTALL="sh /usr/src/tools/install.sh"  TOOLS_PREFIX=/usr/obj/usr/src/amd64.amd64/tmp  PATH=/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/sbin:/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/bin:/usr/obj/usr/src/amd64.amd64/tmp/legacy/bin:/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/libexec:/sbin:/bin:/usr/sbin:/usr/bin  WORLDTMP=/usr/obj/usr/src/amd64.amd64/tmp  MAKEFLAGS="-m /usr/src/tools/build/mk  -m /usr/src/share/mk" make  -f Makefile.inc1  DESTDIR=  OBJTOP='/usr/obj/usr/src/amd64.amd64/tmp/obj-tools'  OBJROOT='${OBJTOP}/'  MAKEOBJDIRPREFIX=  BOOTSTRAPPING=1302001  BWPHASE=bootstrap-tools  -DNO_CPU_CFLAGS  -DNO_LINT  -DNO_PIC  -DNO_SHARED  MK_CTF=no  MK_CLANG_EXTRAS=no  MK_CLANG_FORMAT=no  MK_CLANG_FULL=no  MK_HTML=no  MK_MAN=no  MK_PROFILE=no  MK_RETPOLINE=no  MK_SSP=no  MK_TESTS=no  MK_WERROR=no  MK_INCLUDES=yes  MK_MAN_UTILS=yes MK_LLVM_TARGET_ALL=no bootstrap-tools
===> lib/clang/libllvmminimal (obj,all,install)
[Creating objdir /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/lib/clang/libllvmminimal...]
[Creating nested objdir /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/lib/clang/libllvmminimal/Demangle...]
[Creating nested objdir /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/lib/clang/libllvmminimal/Support...]
[Creating nested objdir /usr/obj/usr/src/amd64.amd64/tmp/obj-tools/lib/clang/libllvmminimal/TableGen...]
c++  -O2 -pipe -fno-common -I/usr/src/lib/clang/include -I/usr/src/contrib/llvm-project/llvm/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DHAVE_VCS_VERSION_INC -DNDEBUG -DLLVM_DEFAULT_TARGET_TRIPLE=\"x86_64-unknown-freebsd13.3\" -DLLVM_HOST_TRIPLE=\"x86_64-unknown-freebsd13.3\" -DDEFAULT_SYSROOT=\"/usr/obj/usr/src/amd64.amd64/tmp\" -DLLVM_TARGET_ENABLE_X86 -DLLVM_NATIVE_ASMPARSER=LLVMInitializeX86AsmParser -DLLVM_NATIVE_ASMPRINTER=LLVMInitializeX86AsmPrinter -DLLVM_NATIVE_DISASSEMBLER=LLVMInitializeX86Disassembler -DLLVM_NATIVE_TARGET=LLVMInitializeX86Target -DLLVM_NATIVE_TARGETINFO=LLVMInitializeX86TargetInfo -DLLVM_NATIVE_TARGETMC=LLVMInitializeX86TargetMC -ffunction-sections -fdata-sections -gline-tables-only -MD -MF.depend.Demangle_ItaniumDemangle.o -MTDemangle/ItaniumDemangle.o -Wno-format-zero-length -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=unused-but-set-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses -Qunused-arguments -I/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include  -fno-exceptions -fno-rtti -gline-tables-only -std=c++17    -stdlib=libc++ -Wno-c++11-extensions   -c /usr/src/contrib/llvm-project/llvm/lib/Demangle/ItaniumDemangle.cpp -o Demangle/ItaniumDemangle.o
In file included from /usr/src/contrib/llvm-project/llvm/lib/Demangle/ItaniumDemangle.cpp:13:
In file included from /usr/src/contrib/llvm-project/llvm/include/llvm/Demangle/Demangle.h:12:
/usr/include/c++/v1/cstddef:45:10: fatal error: '__nullptr' file not found
#include <__nullptr>
         ^~~~~~~~~~~
1 error generated.
*** Error code 1

Stop.
make[3]: stopped in /usr/src/lib/clang/libllvmminimal
*** Error code 1

Stop.
make[2]: stopped in /usr/src
*** Error code 1

Stop.
make[1]: stopped in /usr/src
*** Error code 1

Stop.
make: stopped in /usr/src
Have no idea why some headers are missing and how to restore them.
Could anyone help with the issue?
 
/usr/include/c++/v1/cstddef:45:10: fatal error: '__nullptr' file not found
__nullptr seems to be present in 13.2, but absent in 13.3
Code:
 % find /usr/src-13.2 -name __nullptr
/usr/src-13.2/contrib/llvm-project/libcxx/include/__nullptr

Code:
 % find /usr/src-13.3 -name __nullptr
doesn't return anything.

The source tree got somehow mixed or something.

Clone a fresh tree.
 
Cloning a new copy of src did not fix it for me. The problem is in /usr/include/c++/v1. I copied over the v1 directory from another freebsd box all ready running 13.3. That did fix it for me.
 
Back
Top