Commit e9e7d08f authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge 98074 from mainline. Fix for PR5893. 

llvm-svn: 99956
parent 25e67eda

llvm/unittests/Makefile.unittest

+10 −8
Original line number Diff line number Diff line
@@ -14,18 +14,20 @@ 
# Set up variables for building a unit test.

ifdef TESTNAME



CPP.Flags += -DGTEST_HAS_RTTI=0

# gcc's TR1 <tuple> header depends on RTTI, 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



include $(LEVEL)/Makefile.common



LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)



CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/

CPP.Flags += $(NO_VARIADIC_MACROS)

# Note that these flags are duplicated when building GoogleTest itself in

# utils/unittest/googletest/Makefile; ensure that any changes are made to both.

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 <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



TESTLIBS = -lGoogleTest -lUnitTestMain



ifeq ($(ENABLE_SHARED), 1)

llvm/utils/unittest/googletest/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -14,8 +14,17 @@ include $(LEVEL)/Makefile.config 
LIBRARYNAME = GoogleTest

BUILD_ARCHIVE = 1

REQUIRES_RTTI = 1



# Note that these flags are duplicated when building individual tests in

# unittests/Makefile.unittest; ensure that any changes are made to both.

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 <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





ifeq ($(HOST_OS),MingW)

  CPP.Flags += -DGTEST_OS_WINDOWS=1