projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check .rela instead of ELF64 for the compensation vaue resetting
[oota-llvm.git]
/
unittests
/
Makefile.unittest
diff --git
a/unittests/Makefile.unittest
b/unittests/Makefile.unittest
index 6001c436e5ae91c2a8e2a1ff7f6054c41326987c..bd32aed4b0a2e4c39a8f5521ce04ab815b253b29 100644
(file)
--- a/
unittests/Makefile.unittest
+++ b/
unittests/Makefile.unittest
@@
-14,7
+14,9
@@
# Set up variables for building a unit test.
ifdef TESTNAME
# Set up variables for building a unit test.
ifdef TESTNAME
+ifndef MAKEFILE_UNITTEST_NO_INCLUDE_COMMON
include $(LEVEL)/Makefile.common
include $(LEVEL)/Makefile.common
+endif
LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)
LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)
@@
-27,15
+29,22
@@
CPP.Flags += -DGTEST_HAS_RTTI=0
# supported by Clang, so force googletest to use its own tuple implementation.
CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE
# supported by Clang, so force googletest to use its own tuple implementation.
CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE
-TESTLIBS = -lGoogleTest -lUnitTestMain
+# Disable pthreads if LLVM was configured without them.
+ifneq ($(HAVE_PTHREAD), 1)
+ CPP.Flags += -DGTEST_HAS_PTHREAD=0
+endif
+
+TESTLIBS = -lgtest -lgtest_main
ifeq ($(ENABLE_SHARED), 1)
ifeq ($(ENABLE_SHARED), 1)
- # Add the absolute path to the dynamic library. This is ok because
- # we'll never install unittests.
- LD.Flags += $(RPATH) -Wl,$(LibDir)
+ ifneq (,$(RPATH))
+ # Add the absolute path to the dynamic library. This is ok because
+ # we'll never install unittests.
+ LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
+ endif
# Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most
# of the time.
# Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most
# of the time.
- Run.Shared := $(SHLIBPATH_VAR)="$(LibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
+ Run.Shared := $(SHLIBPATH_VAR)="$(
Shared
LibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
endif
$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
endif
$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)