summaryrefslogtreecommitdiffstats
path: root/llvm/projects
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
commit8c36688dd71f1ce275fd0c9690c2b4e3a9bdfccc (patch)
tree981ad6cc389335d6ee5fbc014a26ea74b4cb2106 /llvm/projects
parent55c62225389b5bf0f7b331d5de618b0e0542bbc4 (diff)
downloadbcm5719-llvm-8c36688dd71f1ce275fd0c9690c2b4e3a9bdfccc.tar.gz
bcm5719-llvm-8c36688dd71f1ce275fd0c9690c2b4e3a9bdfccc.zip
Reverse the order libc++ and libc++abi are added in CMake.
llvm-svn: 231190
Diffstat (limited to 'llvm/projects')
-rw-r--r--llvm/projects/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/projects/CMakeLists.txt b/llvm/projects/CMakeLists.txt
index 8d244fd49ed..428ce84efd7 100644
--- a/llvm/projects/CMakeLists.txt
+++ b/llvm/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)
OpenPOWER on IntegriCloud