Module Name: src
Committed By: christos
Date: Wed Oct 12 18:43:40 UTC 2016
Modified Files:
src/tools/gdb: Makefile
Log Message:
Define __STDC_{LIMIT,CONSTANT,FORMAT}_MACROS in CXXFLAGS.
The problem is that the gnulib interception of <stdint.h> and <inttypes.h>
does not really work because we implement those internally with
<sys/inttypes.h> and <sys/stdint.h> and those internal headers are used
by other internal headers *before* they get a chance to be intercepted
(where the __STDC_ macros are defined).
Another way to fix this is to move the inclusion of the other headers
in <stdint.h> and <inttypes.h> outside multiple inclusion protection.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 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.27 src/tools/gdb/Makefile:1.28
--- src/tools/gdb/Makefile:1.27 Tue Jan 26 12:48:31 2016
+++ src/tools/gdb/Makefile Wed Oct 12 14:43:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/01/26 17:48:31 christos Exp $
+# $NetBSD: Makefile,v 1.28 2016/10/12 18:43:40 christos Exp $
.include <bsd.own.mk>
@@ -18,6 +18,9 @@ INSTALL_TARGET= install-gdb
.include "${.CURDIR}/../Makefile.gmakehost"
CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
+CXXADDFLAGS+= -D__STDC_FORMAT_MACROS
+CXXADDFLAGS+= -D__STDC_LIMIT_MACROS
+CXXADDFLAGS+= -D__STDC_CONSTANT_MACROS
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-gdb
@@ -65,7 +68,8 @@ native-gdb: .native/.configure_done
CC=${CC:Q}' '${CCADDFLAGS:Q} \
CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
- CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS=${LDADDFLAGS:Q} \
+ CFLAGS= CPPFLAGS= CXXFLAGS=${CXXADDFLAGS:Q} \
+ LDFLAGS=${LDADDFLAGS:Q} \
MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
LIBS=-lintl \
