summaryrefslogtreecommitdiff
path: root/projects/CMakeLists.txt
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-03-04 01:16:43 +0000
committerEric Fiselier <eric@efcs.ca>2015-03-04 01:16:43 +0000
commite4c5d93c763facc77fcee72eabacb9cf265c7914 (patch)
treef6e09572c95116db936c73b663ce4d52e6a08fcd /projects/CMakeLists.txt
parent9aa29a4c23d6d593f8aab15bdc26835558d84910 (diff)
Reverse the order libc++ and libc++abi are added in CMake.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231190 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects/CMakeLists.txt')
-rw-r--r--projects/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index 8d244fd49ed..428ce84efd7 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -19,8 +19,10 @@ if(${LLVM_BUILD_RUNTIME})
# MSVC isn't quite working with libc++ yet, disable it until issues are
# fixed.
if(NOT MSVC)
- add_llvm_external_project(libcxx)
+ # libc++ uses the libc++abi target names so libc++abi should be added
+ # first.
add_llvm_external_project(libcxxabi)
+ add_llvm_external_project(libcxx)
endif()
if(NOT LLVM_BUILD_EXTERNAL_COMPILER_RT)
add_llvm_external_project(compiler-rt)