From d12943e0284fd8b908ce9d454bc13845bbbcfaaa Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 19 Dec 2012 09:19:57 +0000 Subject: [PATCH] [TSan] build only gtest-all.o when building TSan unit tests llvm-svn: 170519 --- compiler-rt/lib/tsan/Makefile.old | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/tsan/Makefile.old b/compiler-rt/lib/tsan/Makefile.old index ff220ce..5a6f16b1 100644 --- a/compiler-rt/lib/tsan/Makefile.old +++ b/compiler-rt/lib/tsan/Makefile.old @@ -15,7 +15,8 @@ LIBTSAN=rtl/libtsan.a GTEST_ROOT=third_party/googletest GTEST_INCLUDE=-I$(GTEST_ROOT)/include GTEST_BUILD_DIR=$(GTEST_ROOT)/build -GTEST_LIB=$(GTEST_BUILD_DIR)/gtest-all.o +GTEST_LIB_NAME=gtest-all.o +GTEST_LIB=$(GTEST_BUILD_DIR)/$(GTEST_LIB_NAME) SANITIZER_COMMON_TESTS_SRC=$(wildcard ../sanitizer_common/tests/*_test.cc) SANITIZER_COMMON_TESTS_OBJ=$(patsubst %.cc,%.o,$(SANITIZER_COMMON_TESTS_SRC)) @@ -84,7 +85,7 @@ install_deps: $(GTEST_LIB): mkdir -p $(GTEST_BUILD_DIR) && \ cd $(GTEST_BUILD_DIR) && \ - $(MAKE) -f ../make/Makefile CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" CC=$(CC) CXX=$(CXX) + $(MAKE) -f ../make/Makefile CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" CC=$(CC) CXX=$(CXX) $(GTEST_LIB_NAME) clean: rm -f asm_*.s libtsan.nm libtsan.objdump */*.o tsan_test -- 2.7.4