[AArch64]Fix bug in function names in test case

[oota-llvm.git] / utils / unittest / googletest / Makefile

diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
index 1ec979d961e8001da48477ee142ffba1447f8222..3d85e7da0ba609ca75ca1567010c62be07b3b05e 100644 (file)
--- a/utils/unittest/googletest/Makefile
+++ b/utils/unittest/googletest/Makefile
@@ -11,7 +11,7 @@ LEVEL := ../../..
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = GoogleTest
+LIBRARYNAME = gtest
 BUILD_ARCHIVE = 1
 REQUIRES_RTTI = 1
 
@@ -19,13 +19,17 @@ REQUIRES_RTTI = 1
 # unittests/Makefile.unittest and ../UnitTestMain/Makefile; ensure that any
 # changes are made to both.
 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest
 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
 CPP.Flags += -DGTEST_HAS_RTTI=0
 # libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not
 # supported by Clang, so force googletest to use its own tuple implementation.
-# When we import googletest >=1.4.0, we can drop this line.
-CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
+CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE
 
+# Disable pthreads if LLVM was configured without them.
+ifneq ($(HAVE_PTHREAD), 1)
+  CPP.Flags += -DGTEST_HAS_PTHREAD=0
+endif
 
 ifeq ($(HOST_OS),MingW)
   CPP.Flags += -DGTEST_OS_WINDOWS=1
@@ -33,4 +37,6 @@ endif
 
 NO_INSTALL = 1
 
+SOURCES = src/gtest-all.cc
+
 include $(LEVEL)/Makefile.common