Merge pull request #6311 from liewegas/wip-rocksdb

rocksdb: build with PORTABLE=1 Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Oct 19, 2015 · d8a3208 · d8a3208
2 parents d4a4e44 + b22690e
commit d8a3208
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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