From 4ff1013c35a12d18a568822162e50e704ce4c55e Mon Sep 17 00:00:00 2001 From: rin Date: Thu, 17 Aug 2023 07:54:10 +0000 Subject: [PATCH] tools/gdb: Drop working dir for mknative from generated files Migrate -I${.OBJDIR}/.native/include from CPPFLAGS to CCADDFLAGS for this purpose. No binary changes for native binaries as far as I can see. --- tools/gdb/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index 14e61a1c6629..18a0de6026d1 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2023/08/17 05:35:09 rin Exp $ +# $NetBSD: Makefile,v 1.48 2023/08/17 07:54:10 rin Exp $ .include @@ -38,7 +38,7 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*:Nam_cv_func_iconv*} \ CC=${CC:Q}' '${CCADDFLAGS:Q} \ CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \ CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \ - CFLAGS= CPPFLAGS=-I${.OBJDIR}/.native/include \ + CFLAGS= CPPFLAGS= \ CXXFLAGS= LDFLAGS=-L${GMPOBJ} \ AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \ MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \ @@ -49,7 +49,9 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*:Nam_cv_func_iconv*} \ MKENV_BUILD_MAKE=${MKNATIVE_ENV} ${BUILD_MAKE} -CCADDFLAGS+= --sysroot=${DESTDIR} -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include +CCADDFLAGS+= --sysroot=${DESTDIR} -B${DESTDIR}/usr/lib/ \ + -I${.OBJDIR}/.native/include \ + -I${.OBJDIR}/.native/gcc/include LDADDFLAGS+= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib CXXADDFLAGS+= -D__STDC_FORMAT_MACROS CXXADDFLAGS+= -D__STDC_LIMIT_MACROS