Revert "Fix TSAN build for fbcode"

Summary:
Reverting c745f1d2c4b72a58874605c5da4180a4cb9a0366 because it
was based on an incorrect understanding of the correct way to enable
TSAN tests (it assumes "make COMPILE_WITH_TSAN=1 check" but in fact only
"COMPILE_WITH_TSAN=1 make check" is supported).

Test Plan: COMPILE_WITH_TSAN=1 make check

Reviewers: kradhakrishnan

Reviewed By: kradhakrishnan

Subscribers: dhruba

Differential Revision: https://reviews.facebook.net/D50445

diff --git a/Makefile b/Makefile
index 9b96248f6ea91077daeb9011334fc312dd018499..bbb59891fb8df9fa540a0fbe9fd7ab244865e29a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -155,10 +155,8 @@ ifdef COMPILE_WITH_TSAN
        EXEC_LDFLAGS += -fsanitize=thread -pie
        PLATFORM_CCFLAGS += -fsanitize=thread -fPIC -DROCKSDB_TSAN_RUN
        PLATFORM_CXXFLAGS += -fsanitize=thread -fPIC -DROCKSDB_TSAN_RUN
-       # Use PIC versions of any precompiled libraries
-       EXEC_LDFLAGS := $(shell echo "$(EXEC_LDFLAGS)" | sed -e 's/[.]a /_pic.a /g')
-       # Turn off -pg when enabling TSAN testing, because that induces
-       # a link failure.  TODO: find the root cause
+        # Turn off -pg when enabling TSAN testing, because that induces
+        # a link failure.  TODO: find the root cause
        pg =
 else
        pg = -pg

diff --git a/build_tools/fbcode_config.sh b/build_tools/fbcode_config.sh
index 4692823384ac7abe4838585b480ec9674161a847..d6c7b2a28d472c41c4166593259cebd16610c12e 100644 (file)
--- a/build_tools/fbcode_config.sh
+++ b/build_tools/fbcode_config.sh
@@ -30,8 +30,8 @@ CFLAGS+=" -DSNAPPY"
 
 if test -z $PIC_BUILD; then
   # location of zlib headers and libraries
-  ZLIB_INCLUDE=" -I /mnt/gvfs/third-party2/zlib/bdbc7c65a775f6b1c6ae43d677b1d380720dba7c/1.2.8/gcc-4.9-glibc-2.20/e9936bf/include/"
-  ZLIB_LIBS=" /mnt/gvfs/third-party2/zlib/bdbc7c65a775f6b1c6ae43d677b1d380720dba7c/1.2.8/gcc-4.9-glibc-2.20/e9936bf/lib/libz.a"
+  ZLIB_INCLUDE=" -I /mnt/gvfs/third-party2/zlib/feb983d9667f4cf5e9da07ce75abc824764b67a1/1.2.8/gcc-4.9-glibc-2.20/4230243/include/"
+  ZLIB_LIBS=" /mnt/gvfs/third-party2/zlib/feb983d9667f4cf5e9da07ce75abc824764b67a1/1.2.8/gcc-4.9-glibc-2.20/4230243/lib/libz.a"
   CFLAGS+=" -DZLIB"
 
   # location of bzip headers and libraries