Module Name: src
Committed By: rin
Date: Thu Aug 17 07:54:11 UTC 2023
Modified Files:
src/tools/gdb: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.47 src/tools/gdb/Makefile:1.48
--- src/tools/gdb/Makefile:1.47 Thu Aug 17 05:35:09 2023
+++ src/tools/gdb/Makefile Thu Aug 17 07:54:10 2023
@@ -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 <bsd.hostinit.mk>
@@ -38,7 +38,7 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
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:
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
