diff options
| author | Nathan Bronson <ngbronson@fb.com> | 2015-11-06 09:04:28 -0800 |
|---|---|---|
| committer | Nathan Bronson <ngbronson@fb.com> | 2015-11-06 09:05:12 -0800 |
| commit | c745f1d2c4b72a58874605c5da4180a4cb9a0366 (patch) | |
| tree | 171a7bef2e57bd9422df5518f4eb8ea227f58d17 /build_tools | |
| parent | fe789c5f2b159259a9d0922ecd6f6420e4f02378 (diff) | |
Fix TSAN build for fbcode
Summary:
TSAN builds for gcc 4.9 need a PIC version of the libraries
taken from the fbcode platform. This is accomplished by assuming every
.a has a _pic.a sibling, and by fixing the third-party2 zlib build.
Test Plan: make COMPILE_WITH_TSAN=1 check
Reviewers: sdong, igor
Reviewed By: igor
Subscribers: dhruba
Differential Revision: https://reviews.facebook.net/D50331
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/fbcode_config.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_tools/fbcode_config.sh b/build_tools/fbcode_config.sh index d6c7b2a28..469282338 100644 --- 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/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" + 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" CFLAGS+=" -DZLIB" # location of bzip headers and libraries |