Skip to content

Commit ac2fe72

Browse files
liukaiKai Liu
authored and
Kai Liu
committed
Compile dynamic library by default
Summary: Per request, some users need to use dynamic rocksdb library instead of static one. However currently the dynamic libraries have to be manually compiled by default, which is inconvenient. I made dymamic libraries to be compiled by default. Test Plan: make clean; make; make clean; Reviewers: haobo, sdong, dhruba, igor Reviewed By: haobo CC: leveldb Differential Revision: https://reviews.facebook.net/D15117
1 parent c4548d5 commit ac2fe72

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ $(SHARED2): $(SHARED3)
127127
ln -fs $(SHARED3) $(SHARED2)
128128
endif
129129

130-
$(SHARED3):
131-
$(CXX) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(COVERAGEFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $@ $(LDFLAGS)
130+
$(SHARED3): $(LIBOBJECTS)
131+
$(CXX) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(LDFLAGS) $(SOURCES)-o $@
132132

133133
endif # PLATFORM_SHARED_EXT
134134

135-
all: $(LIBRARY) $(PROGRAMS)
135+
all: $(LIBRARY) $(PROGRAMS) $(SHARED)
136136

137137
.PHONY: blackbox_crash_test check clean coverage crash_test ldb_tests \
138138
release tags valgrind_check whitebox_crash_test

build_tools/build_detect_platform

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ PLATFORM_CCFLAGS=
8181
PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS ${CXXFLAGS}"
8282
PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS"
8383
PLATFORM_SHARED_EXT="so"
84-
PLATFORM_SHARED_LDFLAGS="${EXEC_LDFLAGS_SHARED} -shared -Wl,-soname -Wl,"
84+
PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
8585
PLATFORM_SHARED_CFLAGS="-fPIC"
86-
PLATFORM_SHARED_VERSIONED=true
86+
PLATFORM_SHARED_VERSIONED=false
8787

8888
# generic port files (working on all platform by #ifdef) go directly in /port
8989
GENERIC_PORT_FILES=`find $ROCKSDB_ROOT/port -name '*.cc' | tr "\n" " "`

build_tools/fbcode.gcc481.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ AR=$TOOLCHAIN_EXECUTABLES/binutils/binutils-2.21.1/da39a3e/bin/ar
6060
RANLIB=$TOOLCHAIN_EXECUTABLES/binutils/binutils-2.21.1/da39a3e/bin/ranlib
6161

6262
CFLAGS="-B$TOOLCHAIN_EXECUTABLES/binutils/binutils-2.21.1/da39a3e/bin/gold -m64 -mtune=generic"
63-
CFLAGS+=" -nostdlib $LIBGCC_INCLUDE $GLIBC_INCLUDE"
63+
CFLAGS+=" $LIBGCC_INCLUDE $GLIBC_INCLUDE"
6464
CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_ATOMIC_PRESENT -DROCKSDB_FALLOCATE_PRESENT"
6565
CFLAGS+=" -DSNAPPY -DGFLAGS -DZLIB -DBZIP2"
6666

0 commit comments

Comments
 (0)