10/stable -> 11/stable buildworld failure

[Russell L. Carter]

Hi,
On amd64, after wading through updating a variety of headers,
running cd src && make buildworld I end up at a seeming dead
end here:

/usr/bin/cc -O2 -pipe -I/usr/src/contrib/elftoolchain/libelftc 
-I/usr/src/contrib/elftoolchain/common -std=gnu99 -Qunused-arguments 
-I/usr/obj/usr/src/tmp/legacy/usr/include  -static 
-L/usr/obj/usr/src/tmp/legacy/usr/lib -o nm nm.o   -ldwarf  -lelf 
-L/usr/obj/usr/src/tmp/usr/src/lib/libelftc -lelftc  -lelf -legacy
nm.o: In function `read_object':
/usr/src/contrib/elftoolchain/nm/nm.c:(.text+0xf0f): undefined reference 
to `dwarf_errmsg_'

Suggestions?

Thanks,
Russell