Reverse the order libc++ and libc++abi are added in CMake.
authorEric Fiselier <eric@efcs.ca>
Wed, 4 Mar 2015 01:16:43 +0000 (01:16 +0000)
committerEric Fiselier <eric@efcs.ca>
Wed, 4 Mar 2015 01:16:43 +0000 (01:16 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231190 91177308-0d34-0410-b5e6-96231b3b80d8

projects/CMakeLists.txt

index 8d244fd49edd555c1417d488de98fd5b670b5e7c..428ce84efd75b60d6c9119bd381bbb5de86288bd 100644 (file)
@@ -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)