Switch over to gnu99 compilation on default for userland.
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:
parent
c0c9ea90a8
commit
300d03a832
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=189801
@ -6,3 +6,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
|
|||||||
IGNORE_PRAGMA= YES
|
IGNORE_PRAGMA= YES
|
||||||
|
|
||||||
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
|
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
|
||||||
|
|
||||||
|
CSTD?= gnu89
|
||||||
|
@ -33,8 +33,6 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
|
|||||||
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
|
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
|
||||||
${UNICODE_SRCS}
|
${UNICODE_SRCS}
|
||||||
|
|
||||||
CFLAGS+= -std=c99
|
|
||||||
|
|
||||||
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
|
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
|
||||||
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
|
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
|
||||||
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
|
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
|
||||||
@ -60,4 +58,6 @@ LDADD= -lpthread -lz
|
|||||||
# atomic.S doesn't like profiling.
|
# atomic.S doesn't like profiling.
|
||||||
NO_PROFILE=
|
NO_PROFILE=
|
||||||
|
|
||||||
|
CSTD= c99
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
PROG= ztest
|
PROG= ztest
|
||||||
NO_MAN=
|
NO_MAN=
|
||||||
|
|
||||||
CFLAGS+= -std=c99
|
|
||||||
|
|
||||||
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
|
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
|
||||||
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
|
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
|
||||||
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
|
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
|
||||||
@ -21,4 +19,6 @@ DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
|
|||||||
${LIBPTHREAD} ${LIBZ} ${LIBAVL}
|
${LIBPTHREAD} ${LIBZ} ${LIBAVL}
|
||||||
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
|
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
|
||||||
|
|
||||||
|
CSTD= c99
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -6,8 +6,6 @@ PROG= zdb
|
|||||||
MAN= zdb.8
|
MAN= zdb.8
|
||||||
SRCS= zdb.c zdb_il.c
|
SRCS= zdb.c zdb_il.c
|
||||||
|
|
||||||
CFLAGS+= -std=c99
|
|
||||||
|
|
||||||
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
|
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
|
||||||
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
|
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
|
||||||
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
|
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
|
||||||
@ -25,4 +23,6 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
|
|||||||
${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
|
${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
|
||||||
LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
|
LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
|
||||||
|
|
||||||
|
CSTD= c99
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -8,22 +8,23 @@
|
|||||||
|
|
||||||
# for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
|
# 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(NO_WARNS) && ${CC} != "icc"
|
||||||
. if defined(CSTD)
|
. if ${CSTD} == "k&r"
|
||||||
. if ${CSTD} == "k&r"
|
|
||||||
CFLAGS += -traditional
|
CFLAGS += -traditional
|
||||||
. elif ${CSTD} == "c89" || ${CSTD} == "c90"
|
. elif ${CSTD} == "c89" || ${CSTD} == "c90"
|
||||||
CFLAGS += -std=iso9899:1990
|
CFLAGS += -std=iso9899:1990
|
||||||
. elif ${CSTD} == "c94" || ${CSTD} == "c95"
|
. elif ${CSTD} == "c94" || ${CSTD} == "c95"
|
||||||
CFLAGS += -std=iso9899:199409
|
CFLAGS += -std=iso9899:199409
|
||||||
. elif ${CSTD} == "c99"
|
. elif ${CSTD} == "c99"
|
||||||
CFLAGS += -std=iso9899:1999
|
CFLAGS += -std=iso9899:1999
|
||||||
. else
|
. else
|
||||||
CFLAGS += -std=${CSTD}
|
CFLAGS += -std=${CSTD}
|
||||||
. endif
|
. endif
|
||||||
# -pedantic is problematic because it also imposes namespace restrictions
|
# -pedantic is problematic because it also imposes namespace restrictions
|
||||||
#CFLAGS += -pedantic
|
#CFLAGS += -pedantic
|
||||||
. endif
|
|
||||||
. if defined(WARNS)
|
. if defined(WARNS)
|
||||||
. if ${WARNS} >= 1
|
. if ${WARNS} >= 1
|
||||||
CWARNFLAGS += -Wsystem-headers
|
CWARNFLAGS += -Wsystem-headers
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PROG= tgmath
|
PROG= tgmath
|
||||||
CFLAGS+= -fno-builtin -std=c99
|
CSTD= c99
|
||||||
|
CFLAGS+= -fno-builtin
|
||||||
NO_MAN=
|
NO_MAN=
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user