git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not return /dev/loop-control in unused_loop_device
[zfs.git]
/
cmd
/
zvol_id
/
Makefile.am
diff --git
a/cmd/zvol_id/Makefile.am
b/cmd/zvol_id/Makefile.am
index
dcdea58
..
5703dd4
100644
(file)
--- a/
cmd/zvol_id/Makefile.am
+++ b/
cmd/zvol_id/Makefile.am
@@
-1,10
+1,14
@@
include $(top_srcdir)/config/Rules.am
include $(top_srcdir)/config/Rules.am
+# Disable GCC stack protection for zvol_id. This is a kludge and should be
+# removed once https://github.com/zfsonlinux/zfs/issues/569 is resolved.
+AM_CFLAGS += -fno-stack-protector
+
DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include
DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include
-
bin
_PROGRAMS = zvol_id
+
udev
_PROGRAMS = zvol_id
zvol_id_SOURCES = \
$(top_srcdir)/cmd/zvol_id/zvol_id_main.c
zvol_id_SOURCES = \
$(top_srcdir)/cmd/zvol_id/zvol_id_main.c