Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3014 utils: Fix an offset overflow in file_create()
[fs/lustre-release.git]
/
lustre
/
utils
/
Makefile.am
diff --git
a/lustre/utils/Makefile.am
b/lustre/utils/Makefile.am
index
bc8d716
..
a353557
100644
(file)
--- a/
lustre/utils/Makefile.am
+++ b/
lustre/utils/Makefile.am
@@
-5,7
+5,7
@@
SUBDIRS = gss
endif
AM_CFLAGS=$(LLCFLAGS)
endif
AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
+AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
-D_FILE_OFFSET_BITS=64
AM_LDFLAGS := -L$(top_builddir)/lnet/utils
LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \
AM_LDFLAGS := -L$(top_builddir)/lnet/utils
LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \
@@
-124,6
+124,7
@@
llog_reader_DEPENDENCIES := $(LIBPTLCTL)
lr_reader_SOURCES = lr_reader.c
mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h
lr_reader_SOURCES = lr_reader.c
mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h
+mount_lustre_CPPFLAGS = $(AM_CPPFLAGS)
mount_lustre_LDADD := $(LIBPTLCTL)
mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
if LDISKFS_ENABLED
mount_lustre_LDADD := $(LIBPTLCTL)
mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
if LDISKFS_ENABLED
@@
-131,7
+132,7
@@
mount_lustre_SOURCES += mount_utils_ldiskfs.c
endif
if ZFS_ENABLED
mount_lustre_SOURCES += mount_utils_zfs.c
endif
if ZFS_ENABLED
mount_lustre_SOURCES += mount_utils_zfs.c
-mount_lustre_CPPFLAGS = -DHAVE_IOCTL_IN_UNISTD_H
+mount_lustre_CPPFLAGS
+
= -DHAVE_IOCTL_IN_UNISTD_H
mount_lustre_CPPFLAGS += $(EXTRA_LIBZFS_INCLUDE)
mount_lustre_LDFLAGS = -pthread -rdynamic -ldl
endif
mount_lustre_CPPFLAGS += $(EXTRA_LIBZFS_INCLUDE)
mount_lustre_LDFLAGS = -pthread -rdynamic -ldl
endif