From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Oct 2015 14:15:38 +0000 (-0400)
Subject: os/Makefile: build rocksdb with PORTABLE=1
X-Git-Tag: v10.0.0~84^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6311%2Fhead;p=ceph.git

os/Makefile: build rocksdb with PORTABLE=1

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/Makefile.am b/src/os/Makefile.am
index 611fa6ff8169..ef0527459614 100644
--- a/src/os/Makefile.am
+++ b/src/os/Makefile.am
@@ -88,8 +88,9 @@ noinst_HEADERS += \
 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)
 rocksdb/librocksdb.a:
-	cd rocksdb && EXTRA_CXXFLAGS=-fPIC make -j$(shell nproc) static_lib
+	cd rocksdb && EXTRA_CXXFLAGS=-fPIC PORTABLE=1 make -j$(shell nproc) static_lib
 libos_a_CXXFLAGS +=  -I rocksdb/include -fPIC
 libos_a_SOURCES += os/RocksDBStore.cc
 libos_a_LIBADD += rocksdb/librocksdb.a