]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/Makefile: build rocksdb with PORTABLE=1 6311/head
authorSage Weil <sage@redhat.com>
Mon, 19 Oct 2015 14:15:38 +0000 (10:15 -0400)
committerSage Weil <sage@redhat.com>
Mon, 19 Oct 2015 14:15:38 +0000 (10:15 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/Makefile.am

index 611fa6ff816915e842289372574851235413dee2..ef052745961465ab35af240c8a6a7147a2fda82b 100644 (file)
@@ -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