diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-03-22 13:38:03 +0100 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-03-23 02:45:50 -0700 |
| commit | e47fd239db2da78081daf1f451313956b53435ef (patch) | |
| tree | 394655fd0bb69d3d38fb9d5454263a79a35175cb | |
| parent | 507f3251f39405332fc1181e7004b60637f26be6 (diff) | |
build: pass SQLITE_CFLAGS while building dht files that include tier.h
Building on FreeBSD has been broken by http://review.gluster.org/9724
which introduces the cluster/tiering xlator. The CFLAGS passed to the
compiler do not include the path where sqlite3.h can be found.
In fact, an attempt was made to pass the flags on, but a later variable
overwrite these again.
BUG: 1194753
Change-Id: I1c890fa9a0d82492726306fe6b03bd50ca985e31
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9964
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Sachin Pandit <spandit@redhat.com>
| -rw-r--r-- | xlators/cluster/dht/src/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index 46dc4bb840f..2107881d19f 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -24,7 +24,6 @@ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la tier_la_LDFLAGS = -module -avoid-version tier_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\ $(top_builddir)/libglusterfs/src/gfdb/libgfdb.la -AM_CFLAGS = -Wall $(GF_CFLAGS) $(SQLITE_CFLAGS) noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h tier.h\ $(top_builddir)/xlators/lib/src/libxlator.h @@ -33,7 +32,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/libglusterfs/src/gfdb \ -I$(top_srcdir)/xlators/lib/src -AM_CFLAGS = -Wall $(GF_CFLAGS) +AM_CFLAGS = -Wall $(GF_CFLAGS) $(SQLITE_CFLAGS) CLEANFILES = |