From: Willem Jan Withagen <wjw@digiware.nl>
Date: Thu, 24 Mar 2016 12:05:18 +0000 (+0100)
Subject: FreeBSD/src/kv/Makefile.am: Fix NPROC and add compilerflags
X-Git-Tag: v11.0.0~547^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7908f8de20dff803be665960dcbe5a5799704e01;p=ceph.git

FreeBSD/src/kv/Makefile.am: Fix NPROC and add compilerflags

 - Silence the Clang compiler on a warning
 - augment the getting of FreeBSD number of CPUs
	NPROC = nproc needs to be conditional as well since
	it will otherwise be executed anyways.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am
index b8761714491..95a189576af 100644
--- a/src/kv/Makefile.am
+++ b/src/kv/Makefile.am
@@ -16,12 +16,17 @@ if WITH_SLIBROCKSDB
 # build rocksdb with its own makefile
 # for some stupid reason this needs -fPIC...
 # PORTABLE=1 fixes the aarch64 build (-march=native doesn't work there)
-NPROC = nproc
+
+ROCKSDBCXX_FLAGS = "-fPIC"
 if FREEBSD
-        NPROC = sysctl -n hw.ncpu
+NPROC = sysctl -n hw.ncpu
+ROCKSDBCXX_FLAGS += "-Wmismatched-tags"
+else
+NPROC = nproc
 endif
+
 rocksdb/librocksdb.a:
-	cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS=-fPIC PORTABLE=1 $(MAKE) -j$(shell ${NPROC}) static_lib
+	cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 ${MAKE} -j$(shell ${NPROC}) static_lib
 libkv_a_CXXFLAGS += -I rocksdb/include -fPIC
 libkv_a_SOURCES += kv/RocksDBStore.cc
 libkv_a_LIBADD += rocksdb/librocksdb.a