<div dir="ltr"><div>I've submitted r214114 as an attempt to bring back the sanitizer buildbot (it started to fail at bootstrap stage: <a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/11643">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/11643</a>).</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Jul 26, 2014 at 4:08 PM, Dan Albert <span dir="ltr"><<a href="mailto:danalbert@google.com" target="_blank">danalbert@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: danalbert<br>
Date: Sat Jul 26 18:08:33 2014<br>
New Revision: 214037<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=214037&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=214037&view=rev</a><br>
Log:<br>
Better defaults for in-tree libc++ with cmake.<br>
<br>
This will detect if you are building libcxx in-tree and libcxxabi is<br>
available.  If so, it will default to using the in-tree libcxxabi by<br>
setting LIBCXX_CXX_ABI to "libcxxabi", LIBCXX_LIBCXXABI_INCLUDE_PATHS to<br>
"${CMAKE_SOURCE_DIR}/projects/libcxxabi/include" and will add "cxxabi"<br>
as a proper dependency.<br>
<br>
Patch by Russell Harmon.<br>
<br>
Modified:<br>
    libcxx/trunk/CMakeLists.txt<br>
<br>
Modified: libcxx/trunk/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=214037&r1=214036&r2=214037&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=214037&r1=214036&r2=214037&view=diff</a><br>

==============================================================================<br>
--- libcxx/trunk/CMakeLists.txt (original)<br>
+++ libcxx/trunk/CMakeLists.txt Sat Jul 26 18:08:33 2014<br>
@@ -46,7 +46,13 @@ option(LIBCXX_INSTALL_SUPPORT_HEADERS "I<br>
<br>
 set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++)<br>
 if (NOT DEFINED LIBCXX_CXX_ABI)<br>
-  set(LIBCXX_CXX_ABI "none")<br>
+  if (NOT DEFINED LIBCXX_BUILT_STANDALONE AND IS_DIRECTORY "${CMAKE_SOURCE_DIR}/projects/libcxxabi")<br>
+    set(LIBCXX_CXX_ABI "libcxxabi")<br>
+    set(LIBCXX_LIBCXXABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include")<br>
+    set(LIBCXX_CXX_ABI_INTREE 1)<br>
+  else ()<br>
+    set(LIBCXX_CXX_ABI "none")<br>
+  endif ()<br>
 endif()<br>
 set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING<br>
     "Specify C++ ABI library to use." FORCE)<br>
@@ -149,6 +155,10 @@ elseif ("${LIBCXX_CXX_ABI}" STREQUAL "li<br>
   setup_abi_lib("LIBCXX_LIBCXXABI_INCLUDE_PATHS" ""<br>
     "c++abi" "cxxabi.h" ""<br>
     )<br>
+<br>
+  if (LIBCXX_CXX_ABI_INTREE)<br>
+    add_dependencies(LIBCXX_CXX_ABI_DEPS cxxabi)<br>
+  endif ()<br>
 elseif ("${LIBCXX_CXX_ABI}" STREQUAL "libcxxrt")<br>
   setup_abi_lib("LIBCXX_LIBCXXRT_INCLUDE_PATHS" "-DLIBCXXRT"<br>
     "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" ""<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div>
</div>