From e9bc77716308d9f6e2f64c1f8915868875e19f53 Mon Sep 17 00:00:00 2001 From: Dhruba Borthakur Date: Tue, 19 Jun 2012 00:56:07 -0700 Subject: [PATCH] While creating the leveldb shared library, use the shared library for jemalloc. Summary: Test Plan: Reviewers: CC: Task ID: # Blame Rev: --- Makefile | 4 ++-- fbcode.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1633ec582..f40c3d1fd 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ $(shell ./build_detect_platform build_config.mk) # this file is generated by the previous line to set build flags and sources include build_config.mk -CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) +CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) LDFLAGS += $(PLATFORM_LDFLAGS) @@ -71,7 +71,7 @@ SHARED2 = $(SHARED1).$(SHARED_MAJOR) SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR) SHARED = $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED3): - $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(INSTALL_PATH)/$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) + $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(INSTALL_PATH)/$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(EXEC_LDFLAGS_SHARED) $(SHARED2): $(SHARED3) ln -fs $(SHARED3) $(SHARED2) $(SHARED1): $(SHARED3) diff --git a/fbcode.sh b/fbcode.sh index fc515f9bc..e9e1835bf 100644 --- a/fbcode.sh +++ b/fbcode.sh @@ -33,5 +33,6 @@ CFLAGS+=" -I $TOOLCHAIN_LIB_BASE/jemalloc/jemalloc-2.2.5/96de4f9/include -DHAVE_ EXEC_LDFLAGS=" -Wl,--whole-archive $TOOLCHAIN_LIB_BASE/jemalloc/jemalloc-2.2.4/96de4f9/lib/libjemalloc.a " EXEC_LDFLAGS+="-Wl,--no-whole-archive $TOOLCHAIN_LIB_BASE/libunwind/libunwind-20100810/4bc2c16/lib/libunwind.a" EXEC_LDFLAGS+="$HDFSLIB $SNAPPY_LIBS" +EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $TOOLCHAIN_LIB_BASE/jemalloc/jemalloc-2.2.4/96de4f9/lib/libjemalloc.so" -export CC CXX AR RANLIB CFLAGS EXEC_LDFLAGS +export CC CXX AR RANLIB CFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED