[llvm] r231190 - Reverse the order libc++ and libc++abi are added in CMake.

Eric Fiselier eric at efcs.ca
Tue Mar 3 17:16:43 PST 2015


Author: ericwf
Date: Tue Mar  3 19:16:43 2015
New Revision: 231190

URL: http://llvm.org/viewvc/llvm-project?rev=231190&view=rev
Log:
Reverse the order libc++ and libc++abi are added in CMake.

Modified:
    llvm/trunk/projects/CMakeLists.txt

Modified: llvm/trunk/projects/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/CMakeLists.txt?rev=231190&r1=231189&r2=231190&view=diff
==============================================================================
--- llvm/trunk/projects/CMakeLists.txt (original)
+++ llvm/trunk/projects/CMakeLists.txt Tue Mar  3 19:16:43 2015
@@ -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)





More information about the llvm-commits mailing list