d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch over to gnu99 compilation on default for userland.

Browse Source 
Tested by:	make universe
Tested by:	ports exp build (done by pav)
Reviewed by:	ru
Reviewed by:	silence on arch
Approved by:	ed (mentor)
This commit is contained in:
Roman Divacky 2009-03-14 17:55:16 +00:00
parent c0c9ea90a8
commit 300d03a832
6 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/Makefile.inc
View File

@ -6,3 +6,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
CSTD?= gnu89

4
cddl/lib/libzpool/Makefile
View File

@ -33,8 +33,6 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
${UNICODE_SRCS}
CFLAGS+= -std=c99
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@ -60,4 +58,6 @@ LDADD= -lpthread -lz
# atomic.S doesn't like profiling.
NO_PROFILE=
CSTD= c99
.include <bsd.lib.mk>

4
cddl/usr.bin/ztest/Makefile
View File

@ -5,8 +5,6 @@
PROG= ztest
NO_MAN=
CFLAGS+= -std=c99
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
@ -21,4 +19,6 @@ DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
${LIBPTHREAD} ${LIBZ} ${LIBAVL}
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
CSTD= c99
.include <bsd.prog.mk>

4
cddl/usr.sbin/zdb/Makefile
View File

@ -6,8 +6,6 @@ PROG= zdb
MAN= zdb.8
SRCS= zdb.c zdb_il.c
CFLAGS+= -std=c99
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@ -25,4 +23,6 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
CSTD= c99
.include <bsd.prog.mk>

17
share/mk/bsd.sys.mk
View File

@ -8,22 +8,23 @@
# for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
# the default is gnu99 for now
CSTD ?= gnu99
.if !defined(NO_WARNS) && ${CC} != "icc"
. if defined(CSTD)
. if ${CSTD} == "k&r"
. if ${CSTD} == "k&r"
CFLAGS += -traditional
. elif ${CSTD} == "c89" || ${CSTD} == "c90"
. elif ${CSTD} == "c89" || ${CSTD} == "c90"
CFLAGS += -std=iso9899:1990
. elif ${CSTD} == "c94" || ${CSTD} == "c95"
. elif ${CSTD} == "c94" || ${CSTD} == "c95"
CFLAGS += -std=iso9899:199409
. elif ${CSTD} == "c99"
. elif ${CSTD} == "c99"
CFLAGS += -std=iso9899:1999
. else
. else
CFLAGS += -std=${CSTD}
. endif
. endif
# -pedantic is problematic because it also imposes namespace restrictions
#CFLAGS += -pedantic
. endif
. if defined(WARNS)
. if ${WARNS} >= 1
CWARNFLAGS += -Wsystem-headers

3
tools/regression/include/tgmath/Makefile
View File

@ -1,7 +1,8 @@
# $FreeBSD$
PROG= tgmath
CFLAGS+= -fno-builtin -std=c99
CSTD= c99
CFLAGS+= -fno-builtin
NO_MAN=
.include <bsd.prog.mk>