diff options
| author |  yang-g <yangg@google.com> | 2016-01-15 16:08:20 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-15 16:08:20 -0800 |
| commit | a49474e2cb1fec509d1de3c83ef3c0c9eeb95065 (patch) | |
| tree | 0d0b2abceca4654adef6259748a3ffc2c688d466 /Makefile | |
| parent | 5d7b6a21dfe6edc2328022c5804ebd5ffdc4fe9f (diff) | |
| parent | a0fffb7bfb4b9ad7e51395a3a818518c3134a2e0 (diff) | |
Merge remote-tracking branch 'upstream/master' into epollset
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -36,6 +36,9 @@ +comma := , + + # Basic platform detection HOST_SYSTEM = $(shell uname | cut -f 1 -d_) ifeq ($(SYSTEM),) @@ -149,7 +152,7 @@ LD_tsan = clang LDXX_tsan = clang++ CFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -fPIE -pie CXXFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -fPIE -pie -LDFLAGS_tsan = -fsanitize=thread -fPIE -pie -Wl,-Ttext-segment=0x7e0000000000 +LDFLAGS_tsan = -fsanitize=thread -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,) DEFINES_tsan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=10 VALID_CONFIG_asan = 1 @@ -171,7 +174,7 @@ LD_msan = clang LDXX_msan = clang++-libc++ CFLAGS_msan = -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument -fPIE -pie CXXFLAGS_msan = -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument -fPIE -pie -LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -fPIE -pie -Wl,-Ttext-segment=0x7e0000000000 +LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,) DEFINES_msan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=4 VALID_CONFIG_ubsan = 1 |