aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-17 15:34:31 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-17 15:34:31 -0700
commita09af92d232354ebdb72e0ca9aac485584851c88 (patch)
treebfa0fc1ee4c264e97a2b228fa4d7a930d23d9591 /Makefile
parent50b89533b55e465c201885063e255740b68c1277 (diff)
parent112923f75ea169a36cd1883897f78f918d6a80ac (diff)
Merge branch 'make_clang_great_again_v2' of github.com:vjpai/grpc into fuzzy-bits
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 16b2c026b3..2275f5698b 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ CXX_tsan = clang++
LD_tsan = clang
LDXX_tsan = clang++
CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_tsan = -fsanitize=thread -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
+LDFLAGS_tsan = -fsanitize=thread -fPIE -pie
DEFINES_tsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5
VALID_CONFIG_stapprof = 1
@@ -226,7 +226,7 @@ CXX_etsan = clang++
LD_etsan = clang
LDXX_etsan = clang++
CPPFLAGS_etsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_etsan = -fsanitize=thread -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
+LDFLAGS_etsan = -fsanitize=thread -fPIE -pie
DEFINES_etsan = _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
DEFINES_etsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5