Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zpios' into linux-zpios

This commit is contained in:
Brian Behlendorf 2010-07-23 10:44:44 -07:00
parent 2bff95ac4a 7fa6f8b93a
commit 16a2ff5643
8 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ztest/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(FRAME_LARGER_THAN) AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

5
config/zfs-build.m4
View File

@ -18,15 +18,18 @@ AC_DEFUN([ZFS_AC_DEBUG], [
[ [
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror" HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
DEBUG_CFLAGS="-DDEBUG -Werror -fstack-check" DEBUG_CFLAGS="-DDEBUG -Werror"
DEBUG_STACKFLAGS="-fstack-check"
], ],
[ [
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
DEBUG_CFLAGS="-DNDEBUG" DEBUG_CFLAGS="-DNDEBUG"
DEBUG_STACKFLAGS=""
]) ])
AC_SUBST(DEBUG_CFLAGS) AC_SUBST(DEBUG_CFLAGS)
AC_SUBST(DEBUG_STACKFLAGS)
AC_MSG_RESULT([$enable_debug]) AC_MSG_RESULT([$enable_debug])
]) ])

2
lib/libavl/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

2
lib/libefi/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libefi/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

2
lib/libnvpair/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \

2
lib/libunicode/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/unicode/include \ -I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

2
lib/libuutil/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

2
lib/libzpool/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(FRAME_LARGER_THAN) AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
SUBDIRS = include SUBDIRS = include
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \