From e378b48f3019fc909a59c8f9f35b8f58d147c8b6 Mon Sep 17 00:00:00 2001
From: joerg <joerg@NetBSD.org>
Date: Wed, 13 Dec 2017 21:52:55 +0000
Subject: [PATCH] Improve CFLAGS definition for clang. Use more tabs.

---
 external/gpl3/gdb/bin/gdb/Makefile    | 12 +++++-------
 external/gpl3/gdb/bin/gdbtui/Makefile | 12 +++++-------
 external/gpl3/gdb/lib/libgdb/Makefile | 12 +++++-------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/external/gpl3/gdb/bin/gdb/Makefile b/external/gpl3/gdb/bin/gdb/Makefile
index 562e666a0abc..1597c7fea5ff 100644
--- a/external/gpl3/gdb/bin/gdb/Makefile
+++ b/external/gpl3/gdb/bin/gdb/Makefile
@@ -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} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM
 .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}
diff --git a/external/gpl3/gdb/bin/gdbtui/Makefile b/external/gpl3/gdb/bin/gdbtui/Makefile
index 92eb9182b6c2..08fa47f3494b 100644
--- a/external/gpl3/gdb/bin/gdbtui/Makefile
+++ b/external/gpl3/gdb/bin/gdbtui/Makefile
@@ -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}
diff --git a/external/gpl3/gdb/lib/libgdb/Makefile b/external/gpl3/gdb/lib/libgdb/Makefile
index 7efb2dadedb8..d594e31aa08d 100644
--- a/external/gpl3/gdb/lib/libgdb/Makefile
+++ b/external/gpl3/gdb/lib/libgdb/Makefile
@@ -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 \