Module Name:    src
Committed By:   joerg
Date:           Wed Dec 13 21:52:55 UTC 2017

Modified Files:
        src/external/gpl3/gdb/bin/gdb: Makefile
        src/external/gpl3/gdb/bin/gdbtui: Makefile
        src/external/gpl3/gdb/lib/libgdb: Makefile

Log Message:
Improve CFLAGS definition for clang. Use more tabs.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/bin/gdb/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/bin/gdbtui/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gdb/lib/libgdb/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/bin/gdb/Makefile
diff -u src/external/gpl3/gdb/bin/gdb/Makefile:1.14 src/external/gpl3/gdb/bin/gdb/Makefile:1.15
--- src/external/gpl3/gdb/bin/gdb/Makefile:1.14	Fri Dec  8 14:19:47 2017
+++ src/external/gpl3/gdb/bin/gdb/Makefile	Wed Dec 13 21:52:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2017/12/08 14:19:47 rin Exp $
+#	$NetBSD: Makefile,v 1.15 2017/12/13 21:52:55 joerg Exp $
 
 NOCTF=
 .include <bsd.own.mk>
@@ -89,12 +89,10 @@ DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} 
 .include <bsd.prog.mk>
 
 # Force c++
-HOST_CC:=       ${HOST_CXX}
-CC:=            ${CXX}
-CFLAGS:=        ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
-.if ${ACTIVE_CC} == "clang"
-CFLAGS+=	-Wno-deprecated
-.endif
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
     ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}

Index: src/external/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.11 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.12
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.11	Fri Dec  8 14:19:47 2017
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile	Wed Dec 13 21:52:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2017/12/08 14:19:47 rin Exp $
+#	$NetBSD: Makefile,v 1.12 2017/12/13 21:52:55 joerg Exp $
 NOCTF=
 .include "../Makefile.inc"
 
@@ -26,12 +26,10 @@ NOMAN=		# defined
 .include <bsd.prog.mk>
 
 # Force c++
-HOST_CC:=       ${HOST_CXX}
-CC:=            ${CXX}
-CFLAGS:=        ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
-.if ${ACTIVE_CC} == "clang"
-CFLAGS+=	-Wno-deprecated
-.endif
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 LIBOPCODESDIR!=   cd ${.CURDIR}/../../lib/libopcodes   && ${PRINTOBJDIR}
 LIBBFDDIR!=       cd ${.CURDIR}/../../lib/libbfd       && ${PRINTOBJDIR}

Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.18 src/external/gpl3/gdb/lib/libgdb/Makefile:1.19
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.18	Fri Dec  8 14:19:47 2017
+++ src/external/gpl3/gdb/lib/libgdb/Makefile	Wed Dec 13 21:52:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2017/12/08 14:19:47 rin Exp $
+#	$NetBSD: Makefile,v 1.19 2017/12/13 21:52:55 joerg Exp $
 
 NOCTF=
 HOSTPROG_CXX=   1
@@ -55,12 +55,10 @@ CWARNFLAGS.clang+=	-Wno-switch
 .include <bsd.lib.mk>
 
 # Force c++
-HOST_CC:=       ${HOST_CXX}
-CC:=            ${CXX}
-CFLAGS:=        ${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
-.if ${ACTIVE_CC} == "clang"
-CFLAGS+=	-Wno-deprecated
-.endif
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/arch ${DIST}/gdb/mi ${DIST}/gdb/cli  \
     ${DIST}/gdb/tui ${DIST}/gdb/python ${DIST}/gdb/common ${DIST}/gdb/target \

Reply via email to