svn commit: r364120 - head/tools/build

[Alex Richardson]

Author: arichardson
Date: Tue Aug 11 16:46:33 2020
New Revision: 364120
URL: https://svnweb.freebsd.org/changeset/base/364120

Log:
  Fix bootstrapping ldd after r362152
  
  r362152 started using DF_1_PIE, which is not present in older versions
  of sys/elf_common.h. To fix this include the ELF headers as part of -legacy.

Modified:
  head/tools/build/Makefile

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Tue Aug 11 16:46:27 2020	(r364119)
+++ head/tools/build/Makefile	Tue Aug 11 16:46:33 2020	(r364120)
@@ -92,6 +92,12 @@ DISKINCS+=	${SRCTOP}/sys/sys/disk/bsd.h
 SYSINCS+=	${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \
 		${SRCTOP}/sys/sys/dnv.h
 
+# Needed when bootstrapping ldd (since it uses DF_1_PIE)
+SYSINCS+=	${SRCTOP}/sys/sys/elf32.h
+SYSINCS+=	${SRCTOP}/sys/sys/elf64.h
+SYSINCS+=	${SRCTOP}/sys/sys/elf_common.h
+SYSINCS+=	${SRCTOP}/sys/sys/elf_generic.h
+
 # vtfontcvt is using sys/font.h
 SYSINCS+=	${SRCTOP}/sys/sys/font.h