summaryrefslogtreecommitdiff
path: root/utils/unittest
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-12-15 23:35:08 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-12-15 23:35:08 +0000
commitbb53bbb7d4b1ac3da416d922101d4cbc280b145c (patch)
treed0c7fb837d32d11178cdad70695820c27683729d /utils/unittest
parent028700f544deeea423ce9b516e190e4e970e3c6c (diff)
downloadllvm-bb53bbb7d4b1ac3da416d922101d4cbc280b145c.tar.gz
llvm-bb53bbb7d4b1ac3da416d922101d4cbc280b145c.tar.bz2
llvm-bb53bbb7d4b1ac3da416d922101d4cbc280b145c.tar.xz
build/unittests: Fix llvm-config names for gtest libraries, and bring Makefile
library names in line with those used by CMake. - Patch by Johannes Obermayr, with tweaks by me. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146706 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
-rw-r--r--utils/unittest/UnitTestMain/Makefile2
-rw-r--r--utils/unittest/googletest/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile
index 30827795af..7bcb724950 100644
--- a/utils/unittest/UnitTestMain/Makefile
+++ b/utils/unittest/UnitTestMain/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../../..
include $(LEVEL)/Makefile.config
-LIBRARYNAME = UnitTestMain
+LIBRARYNAME = gtest_main
BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1
diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
index 21b29ffc2c..22c8f36fcc 100644
--- 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