diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2009-03-14 17:55:16 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2009-03-14 17:55:16 +0000 |
| commit | 4cd01fc223701ae9a3fc4907d8c8e835ca6193d6 (patch) | |
| tree | 2e832ae7edeb004a0ac2179546f03d09f8ad19b9 /cddl | |
| parent | 9dac23d7ae211df76cd0c75b8afc7a756730f4d4 (diff) | |
| download | FreeBSD-src-4cd01fc223701ae9a3fc4907d8c8e835ca6193d6.zip FreeBSD-src-4cd01fc223701ae9a3fc4907d8c8e835ca6193d6.tar.gz | |
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)
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/Makefile.inc | 2 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 4 | ||||
| -rw-r--r-- | cddl/usr.bin/ztest/Makefile | 4 | ||||
| -rw-r--r-- | cddl/usr.sbin/zdb/Makefile | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc index 99ef333..4161c27 100644 --- a/cddl/Makefile.inc +++ b/cddl/Makefile.inc @@ -6,3 +6,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN + +CSTD?= gnu89 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 26d5499..54ab6c0 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -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> diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index cc0bca4..67ade45ad 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -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> diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index f0c1b22..35ad2a1 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -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> |
