Remove dependency to elfdefinitions.h, this is a mess, since it needs

${TOOL_M4} which might not be available yet.
This commit is contained in:
christos 2024-03-27 21:54:43 +00:00
parent 89eb4d6b6c
commit 1546e871c7
2 changed files with 2 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.nbincludes,v 1.7 2024/03/26 16:48:34 christos Exp $
# $NetBSD: Makefile.nbincludes,v 1.8 2024/03/27 21:54:43 christos Exp $
.include <bsd.hostinit.mk>
@ -6,7 +6,6 @@ _ARCHDIR:= ${.PARSEDIR}/../sys/arch
_INCDIR:= ${.PARSEDIR}/../include
_SYSDIR:= ${.PARSEDIR}/../sys/sys
_UFSDIR:= ${.PARSEDIR}/../sys/ufs
_ELFTOOLCHAINDIR:= ${.PARSEDIR}/elftoolchain
_SUBDIR!= cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
.if make(depend) || make(all) || make(dependall) || make(install)
@ -46,4 +45,3 @@ beforedepend:
${TOOL_PAX} -rw ${_UFS_INCS} ${TOOLDIR}/include/nbinclude/ufs
cd ${TOOLDIR}/include/nbinclude && rm -f machine && \
${HOST_INSTALL_SYMLINK} ${MACHINE} machine
cd ${_ELFTOOLCHAINDIR}/common && ${MAKE} includes

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2024/03/26 16:48:34 christos Exp $
# $NetBSD: Makefile,v 1.5 2024/03/27 21:54:43 christos Exp $
HOSTLIB=dwarf
@ -73,7 +73,6 @@ COMPATLIB_NO_LIB= yes # only the include files, not the library
LIBDWARF_OBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR}
CPPFLAGS+= -DBUILTIN_ELF_HEADERS
CPPFLAGS+= -I${.CURDIR}/../../compat
CPPFLAGS+= -I${.CURDIR}/../../common
CPPFLAGS+= -I${LIBDWARF_OBJDIR}/../common
@ -97,5 +96,4 @@ CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS}
CPPFLAGS:= # empty
.include "../../Makefile.nbincludes"
.include <bsd.hostlib.mk>