RegisterCoalescer: rewrite eliminateUndefCopy().

[oota-llvm.git] / projects / CMakeLists.txt

diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index 67943c2e9a36460fa0b14ccbb4caa6dad7ec8cc2..8d244fd49edd555c1417d488de98fd5b670b5e7c 100644 (file)
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -6,7 +6,8 @@ foreach(entry ${entries})
   if(IS_DIRECTORY ${entry} AND EXISTS ${entry}/CMakeLists.txt)
     if((NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/dragonegg) AND
-       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx))
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx) AND
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxxabi))
       add_subdirectory(${entry})
     endif()
   endif()
@@ -19,8 +20,11 @@ if(${LLVM_BUILD_RUNTIME})
   # fixed.
   if(NOT MSVC)
     add_llvm_external_project(libcxx)
+    add_llvm_external_project(libcxxabi)
+  endif()
+  if(NOT LLVM_BUILD_EXTERNAL_COMPILER_RT)
+    add_llvm_external_project(compiler-rt)
   endif()
-  add_llvm_external_project(compiler-rt)
 endif()
 
 add_llvm_external_project(dragonegg)