Module Name: src
Committed By: joerg
Date: Wed Apr 4 10:59:48 UTC 2012
Modified Files:
src/bin/stty: Makefile
src/external/bsd/cron/bin/cron: Makefile
src/external/gpl2/xcvs/lib/libcvs: Makefile
src/external/gpl2/xcvs/lib/libdiff: Makefile
src/external/gpl3/gdb: Makefile.inc
src/external/mit/xorg/lib/libFS: Makefile
src/external/mit/xorg/lib/libICE: Makefile
src/external/mit/xorg/lib/libX11: Makefile.libx11
src/external/mit/xorg/lib/libXfont: Makefile
src/gnu/usr.bin/diffutils/diff: Makefile
src/gnu/usr.bin/rcs/lib: Makefile
src/gnu/usr.bin/rcs/rlog: Makefile
src/lib/libm: Makefile
src/lib/libpthread: Makefile
src/regress/sys/kern/ras/ras1: Makefile
src/regress/sys/kern/ras/ras2: Makefile
src/regress/sys/kern/ras/ras3: Makefile
src/share/mk: bsd.x11.mk
src/tests/lib/libc/ssp: Makefile
Log Message:
Disable new -Wstring-plus-int warning where needed for now.
Adjust various places that add GCC-only options to check for the active
compiler first.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/bin/stty/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/cron/bin/cron/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/xcvs/lib/libcvs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/xcvs/lib/libdiff/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libFS/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libICE/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXfont/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/diffutils/diff/Makefile
cvs rdiff -u -r1.23 -r1.24 src/gnu/usr.bin/rcs/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/rcs/rlog/Makefile
cvs rdiff -u -r1.122 -r1.123 src/lib/libm/Makefile
cvs rdiff -u -r1.75 -r1.76 src/lib/libpthread/Makefile
cvs rdiff -u -r1.5 -r1.6 src/regress/sys/kern/ras/ras1/Makefile
cvs rdiff -u -r1.5 -r1.6 src/regress/sys/kern/ras/ras2/Makefile
cvs rdiff -u -r1.5 -r1.6 src/regress/sys/kern/ras/ras3/Makefile
cvs rdiff -u -r1.105 -r1.106 src/share/mk/bsd.x11.mk
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/ssp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/stty/Makefile
diff -u src/bin/stty/Makefile:1.10 src/bin/stty/Makefile:1.11
--- src/bin/stty/Makefile:1.10 Sun Jul 20 22:38:04 1997
+++ src/bin/stty/Makefile Wed Apr 4 10:59:44 2012
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.10 1997/07/20 22:38:04 christos Exp $
+# $NetBSD: Makefile,v 1.11 2012/04/04 10:59:44 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= stty
SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
.include <bsd.prog.mk>
Index: src/external/bsd/cron/bin/cron/Makefile
diff -u src/external/bsd/cron/bin/cron/Makefile:1.1 src/external/bsd/cron/bin/cron/Makefile:1.2
--- src/external/bsd/cron/bin/cron/Makefile:1.1 Thu May 6 18:58:45 2010
+++ src/external/bsd/cron/bin/cron/Makefile Wed Apr 4 10:59:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/05/06 18:58:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2012/04/04 10:59:44 joerg Exp $
BINDIR= /usr/sbin
PROG= cron
@@ -8,4 +8,6 @@ CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
LDADD+=-lutil
MAN= cron.8
+CWARNFLAGS+= -Wno-string-plus-int
+
.include <bsd.prog.mk>
Index: src/external/gpl2/xcvs/lib/libcvs/Makefile
diff -u src/external/gpl2/xcvs/lib/libcvs/Makefile:1.10 src/external/gpl2/xcvs/lib/libcvs/Makefile:1.11
--- src/external/gpl2/xcvs/lib/libcvs/Makefile:1.10 Thu Dec 30 00:46:38 2010
+++ src/external/gpl2/xcvs/lib/libcvs/Makefile Wed Apr 4 10:59:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/12/30 00:46:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.11 2012/04/04 10:59:44 joerg Exp $
LIBISPRIVATE= yes
@@ -18,6 +18,8 @@ SRCS= __fpending.c asnprintf.c basename.
stripslash.c vasnprintf.c xalloc-die.c xgetcwd.c xgethostname.c \
xmalloc.c xreadlink.c yesno.c
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
.include <bsd.lib.mk>
# bsd.lib.mk includes bsd.sys.mk which defines the suffix rules, so we
# need to override after.
Index: src/external/gpl2/xcvs/lib/libdiff/Makefile
diff -u src/external/gpl2/xcvs/lib/libdiff/Makefile:1.1 src/external/gpl2/xcvs/lib/libdiff/Makefile:1.2
--- src/external/gpl2/xcvs/lib/libdiff/Makefile:1.1 Wed Apr 8 16:27:52 2009
+++ src/external/gpl2/xcvs/lib/libdiff/Makefile Wed Apr 4 10:59:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/08 16:27:52 christos Exp $
+# $NetBSD: Makefile,v 1.2 2012/04/04 10:59:44 joerg Exp $
LIBISPRIVATE= yes
@@ -11,4 +11,6 @@ DIST= ${IDIST}/${LIB}
SRCS != (cd ${DIST} && echo *.c)
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
.include <bsd.lib.mk>
Index: src/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.4 src/external/gpl3/gdb/Makefile.inc:1.5
--- src/external/gpl3/gdb/Makefile.inc:1.4 Sun Feb 5 17:47:30 2012
+++ src/external/gpl3/gdb/Makefile.inc Wed Apr 4 10:59:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2012/02/05 17:47:30 matt Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/04/04 10:59:45 joerg Exp $
USE_LIBEDIT=no
USE_TUI=yes
@@ -8,7 +8,8 @@ WARNS?= 0
CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion \
-Wno-switch-enum -Wno-parentheses -Wno-comment \
-Wno-format-security \
- -Wno-tautological-compare -Wno-format-extra-args
+ -Wno-tautological-compare -Wno-format-extra-args \
+ -Wno-string-plus-int
.if ${MACHINE} == "vax"
CWARNFLAGS.gcc+= -Wno-overflow
Index: src/external/mit/xorg/lib/libFS/Makefile
diff -u src/external/mit/xorg/lib/libFS/Makefile:1.2 src/external/mit/xorg/lib/libFS/Makefile:1.3
--- src/external/mit/xorg/lib/libFS/Makefile:1.2 Sat Sep 13 04:32:29 2008
+++ src/external/mit/xorg/lib/libFS/Makefile Wed Apr 4 10:59:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/04 10:59:45 joerg Exp $
.include <bsd.own.mk>
@@ -12,6 +12,8 @@ SRCS= FSCloseFt.c FSClServ.c FSConnServ.
FSQuExt.c FSQXExt.c FSQXInfo.c FSServName.c FSSetCats.c FSSync.c \
FSSynchro.c fs_transport.c
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
INCS= FSlib.h
INCSDIR=${X11INCDIR}/X11/fonts
Index: src/external/mit/xorg/lib/libICE/Makefile
diff -u src/external/mit/xorg/lib/libICE/Makefile:1.2 src/external/mit/xorg/lib/libICE/Makefile:1.3
--- src/external/mit/xorg/lib/libICE/Makefile:1.2 Sat Sep 13 04:32:30 2008
+++ src/external/mit/xorg/lib/libICE/Makefile Wed Apr 4 10:59:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/04 10:59:45 joerg Exp $
.include <bsd.own.mk>
@@ -20,5 +20,7 @@ CPPFLAGS+= $(TRANS_INCLUDES) $(CONN_DEFI
PKGDIST= ${LIB}
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.8 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.9
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.8 Wed Feb 23 07:53:29 2011
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Apr 4 10:59:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.8 2011/02/23 07:53:29 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.9 2012/04/04 10:59:45 joerg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -462,4 +462,6 @@ COPTS.Font.c+= -Wno-error # XXX xf86big
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
.include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys"
Index: src/external/mit/xorg/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.8 src/external/mit/xorg/lib/libXfont/Makefile:1.9
--- src/external/mit/xorg/lib/libXfont/Makefile:1.8 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libXfont/Makefile Wed Apr 4 10:59:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2012/04/04 10:59:45 joerg Exp $
.include <bsd.own.mk>
@@ -46,7 +46,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
CPPFLAGS+= -I${XFONTDIR}/src/stubs
CPPFLAGS+= -I${XFONTDIR}/../include
-
LIBDPLIBS=\
Xt ${.CURDIR}/../libXt \
SM ${.CURDIR}/../libSM \
@@ -65,7 +64,7 @@ COPTS.register.c+= -Wno-error
PKGDIST= ${LIB}
-CWARNFLAGS.clang+= -Wno-tautological-compare
+CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-string-plus-int
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/gnu/usr.bin/diffutils/diff/Makefile
diff -u src/gnu/usr.bin/diffutils/diff/Makefile:1.3 src/gnu/usr.bin/diffutils/diff/Makefile:1.4
--- src/gnu/usr.bin/diffutils/diff/Makefile:1.3 Thu May 26 12:56:27 2011
+++ src/gnu/usr.bin/diffutils/diff/Makefile Wed Apr 4 10:59:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/26 12:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/04 10:59:46 joerg Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -17,7 +17,7 @@ TEXINFO= diff.texi
COPTS.ifdef.c = -Wno-stack-protector
-CWARNFLAGS.clang+= -Wno-unused-value
+CWARNFLAGS.clang+= -Wno-unused-value -Wno-string-plus-int
.include <bsd.info.mk>
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/rcs/lib/Makefile
diff -u src/gnu/usr.bin/rcs/lib/Makefile:1.23 src/gnu/usr.bin/rcs/lib/Makefile:1.24
--- src/gnu/usr.bin/rcs/lib/Makefile:1.23 Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/rcs/lib/Makefile Wed Apr 4 10:59:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2012/04/04 10:59:46 joerg Exp $
LIBISPRIVATE= yes
@@ -19,6 +19,6 @@ SRCS= maketime.c merger.c partime.c rcse
rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
rcsutil.c version.c
-CWARNFLAGS.clang+= -Wno-format-security
+CWARNFLAGS.clang+= -Wno-format-security -Wno-string-plus-int
.include <bsd.lib.mk>
Index: src/gnu/usr.bin/rcs/rlog/Makefile
diff -u src/gnu/usr.bin/rcs/rlog/Makefile:1.7 src/gnu/usr.bin/rcs/rlog/Makefile:1.8
--- src/gnu/usr.bin/rcs/rlog/Makefile:1.7 Mon Apr 20 14:16:01 1998
+++ src/gnu/usr.bin/rcs/rlog/Makefile Wed Apr 4 10:59:46 2012
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 14:16:01 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2012/04/04 10:59:46 joerg Exp $
PROG= rlog
LINKS= ${BINDIR}/rlog ${BINDIR}/rcslog
MLINKS= rlog.1 rcslog.1
+CWARNFLAGS.clang+= -Wno-string-plus-int
+
.include <bsd.prog.mk>
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.122 src/lib/libm/Makefile:1.123
--- src/lib/libm/Makefile:1.122 Wed Mar 21 05:37:42 2012
+++ src/lib/libm/Makefile Wed Apr 4 10:59:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2012/03/21 05:37:42 matt Exp $
+# $NetBSD: Makefile,v 1.123 2012/04/04 10:59:46 joerg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -165,10 +165,8 @@ COMMON_SRCS+= e_acos.c e_acosf.c e_acosh
.PATH: ${.CURDIR}/compat
COMMON_SRCS+= compat_cabs.c compat_cabsf.c
# XXX our compatibility cabs() is different!
-.if defined(HAVE_GCC)
-COPTS.compat_cabs.c= -fno-builtin-cabs
-COPTS.compat_cabsf.c= -fno-builtin-cabsf
-.endif
+COPTS.compat_cabs.c= ${${ACTIVE_CC} == "gcc":? -fno-builtin-cabs :}
+COPTS.compat_cabsf.c= ${${ACTIVE_CC} == "gcc":? -fno-builtin-cabsf :}
# math routines for non-IEEE architectures.
NOIEEE_SRCS = n_asincos.c n_acosh.c n_asinh.c n_atan.c n_atanh.c n_cosh.c \
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.75 src/lib/libpthread/Makefile:1.76
--- src/lib/libpthread/Makefile:1.75 Wed Mar 21 05:37:43 2012
+++ src/lib/libpthread/Makefile Wed Apr 4 10:59:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.76 2012/04/04 10:59:46 joerg Exp $
#
WARNS?= 5
@@ -69,21 +69,23 @@ SRCS+= pthread_compat.c
.include "../../common/lib/libc/arch/${ARCHSUBDIR}/atomic/Makefile.inc"
.endif
+ALIGN_FUNCTIONS= ${${ACTIVE_CC} == "gcc":? -falign-functions=32 :}
+
# The TSD routines are used in the implementation of profiling, and so
# can't be profiled themselves.
-COPTS.pthread_specific.c+= -fomit-frame-pointer -falign-functions=32
+COPTS.pthread_specific.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
pthread_specific.po: pthread_specific.o
${_MKTARGET_CREATE}
cp pthread_specific.o pthread_specific.po
# Internal spinlock routines are performance critical. Don't profile them,
# it's incompatibile with -fomit-frame-pointer.
-COPTS.pthread_lock.c+= -fomit-frame-pointer -falign-functions=32
+COPTS.pthread_lock.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
pthread_lock.po: pthread_lock.o
${_MKTARGET_CREATE}
cp pthread_lock.o pthread_lock.po
-COPTS.pthread_mutex.c+= -fomit-frame-pointer -falign-functions=32
+COPTS.pthread_mutex.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
pthread_mutex.po: pthread_mutex.o
${_MKTARGET_CREATE}
cp pthread_mutex.o pthread_mutex.po
Index: src/regress/sys/kern/ras/ras1/Makefile
diff -u src/regress/sys/kern/ras/ras1/Makefile:1.5 src/regress/sys/kern/ras/ras1/Makefile:1.6
--- src/regress/sys/kern/ras/ras1/Makefile:1.5 Mon Jun 20 07:43:59 2011
+++ src/regress/sys/kern/ras/ras1/Makefile Wed Apr 4 10:59:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
NOMAN= #defined
@@ -12,9 +12,7 @@ regress:
echo "FAILED"; \
fi
-.include <bsd.prog.mk>
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
-.if defined(HAVE_GCC)
-CFLAGS+= -fno-reorder-blocks
-.endif
+.include <bsd.prog.mk>
Index: src/regress/sys/kern/ras/ras2/Makefile
diff -u src/regress/sys/kern/ras/ras2/Makefile:1.5 src/regress/sys/kern/ras/ras2/Makefile:1.6
--- src/regress/sys/kern/ras/ras2/Makefile:1.5 Mon Jun 20 07:43:59 2011
+++ src/regress/sys/kern/ras/ras2/Makefile Wed Apr 4 10:59:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
NOMAN= #defined
@@ -12,8 +12,6 @@ regress:
echo "FAILED"; \
fi
-.include <bsd.prog.mk>
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
-.if defined(HAVE_GCC)
-CFLAGS+= -fno-reorder-blocks
-.endif
+.include <bsd.prog.mk>
Index: src/regress/sys/kern/ras/ras3/Makefile
diff -u src/regress/sys/kern/ras/ras3/Makefile:1.5 src/regress/sys/kern/ras/ras3/Makefile:1.6
--- src/regress/sys/kern/ras/ras3/Makefile:1.5 Mon Jun 20 07:43:59 2011
+++ src/regress/sys/kern/ras/ras3/Makefile Wed Apr 4 10:59:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
NOMAN= #defined
PROG= ras3
@@ -11,8 +11,6 @@ regress:
echo "FAILED"; \
fi
-.include <bsd.prog.mk>
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
-.if defined(HAVE_GCC)
-CFLAGS+= -fno-reorder-blocks
-.endif
+.include <bsd.prog.mk>
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.105 src/share/mk/bsd.x11.mk:1.106
--- src/share/mk/bsd.x11.mk:1.105 Tue Jan 17 19:40:08 2012
+++ src/share/mk/bsd.x11.mk Wed Apr 4 10:59:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.105 2012/01/17 19:40:08 njoly Exp $
+# $NetBSD: bsd.x11.mk,v 1.106 2012/04/04 10:59:47 joerg Exp $
.include <bsd.init.mk>
@@ -123,7 +123,7 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64
${MACHINE} == "zaurus"
# LOADABLE
X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \
- -fno-merge-constants
+ ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
.endif
# XXX FIX ME
Index: src/tests/lib/libc/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.4 src/tests/lib/libc/ssp/Makefile:1.5
--- src/tests/lib/libc/ssp/Makefile:1.4 Sun Jun 12 21:12:46 2011
+++ src/tests/lib/libc/ssp/Makefile Wed Apr 4 10:59:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/12 21:12:46 plunky Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/04 10:59:48 joerg Exp $
NOMAN= # defined
@@ -8,7 +8,10 @@ WARNS= 4
CPPFLAGS+= -D_FORTIFY_SOURCE=2
-COPTS.h_raw.c= -fstack-protector-all -Wstack-protector --param=ssp-buffer-size=1
+COPTS.h_raw.c= -fstack-protector-all -Wstack-protector
+COPTS.h_raw.c+= ${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
+COPTS.h_raw.c+= ${${ACTIVE_CC} == "clang":? -mllvm -stack-protector-buffer-size=1 :}
+
# Bootstrap hack
