From 1add5f378dde00808233c98c82d50e3ca92c5559 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 3 Jun 2010 07:51:58 +0000 Subject: [PATCH] Turns out gtest still prefers the system over it's own implementation. Force the internal one to unbreak clang selfhost on linux. llvm-svn: 105386 --- llvm/unittests/Makefile.unittest | 3 +++ llvm/utils/unittest/UnitTestMain/Makefile | 3 +++ llvm/utils/unittest/googletest/Makefile | 3 +++ 3 files changed, 9 insertions(+) diff --git a/llvm/unittests/Makefile.unittest b/llvm/unittests/Makefile.unittest index 3bed567503db..6001c436e5ae 100644 --- a/llvm/unittests/Makefile.unittest +++ b/llvm/unittests/Makefile.unittest @@ -23,6 +23,9 @@ LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT) CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) CPP.Flags += -DGTEST_HAS_RTTI=0 +# libstdc++'s TR1 header depends on RTTI and uses C++'0x features not +# supported by Clang, so force googletest to use its own tuple implementation. +CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE TESTLIBS = -lGoogleTest -lUnitTestMain diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index 16ac38b5688a..202ccb8eeedc 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -18,5 +18,8 @@ REQUIRES_RTTI = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) CPP.Flags += -DGTEST_HAS_RTTI=0 +# libstdc++'s TR1 header depends on RTTI and uses C++'0x features not +# supported by Clang, so force googletest to use its own tuple implementation. +CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE include $(LEVEL)/Makefile.common diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index b6e3e68a3303..bfd35a4f5100 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -21,6 +21,9 @@ REQUIRES_RTTI = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) CPP.Flags += -DGTEST_HAS_RTTI=0 +# libstdc++'s TR1 header depends on RTTI and uses C++'0x features not +# supported by Clang, so force googletest to use its own tuple implementation. +CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE ifeq ($(HOST_OS),MingW) CPP.Flags += -DGTEST_OS_WINDOWS=1