Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -593,6 +593,12 @@
     add_dependencies(clang-bootstrap-deps compiler-rt)
   endif()
 
+  if(CLANG_BOOTSTRAP_USE_LIBCXX)
+    add_dependencies(clang-bootstrap-deps cxx)
+    list(APPEND BOOTSTRAP_CMAKE_INSTALL_RPATH "${LLVM_LIBRARY_DIR}")
+    set(BOOTSTRAP_CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+  endif()
+
   set(C_COMPILER "clang")
   set(CXX_COMPILER "clang++")
   if(WIN32)
Index: cmake/caches/Android.cmake
===================================================================
--- cmake/caches/Android.cmake
+++ cmake/caches/Android.cmake
@@ -5,6 +5,7 @@
 set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "")
 set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
 set(CLANG_VENDOR Android CACHE STRING "")
+set(CLANG_BOOTSTRAP_USE_LIBCXX ON CACHE BOOL "")
 
 set(CMAKE_BUILD_TYPE RELEASE CACHE STRING "")