Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rocksdb: build with PORTABLE=1 #6311

Merged
1 commit merged into from Oct 19, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/os/Makefile.am
Expand Up @@ -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
Expand Down