Index: compiler-rt/CMakeLists.txt
===================================================================
--- compiler-rt/CMakeLists.txt
+++ compiler-rt/CMakeLists.txt
@@ -142,10 +142,7 @@
 set_property(CACHE SANITIZER_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
 
 if (SANITIZER_CXX_ABI STREQUAL "default")
-  if (CLANG_DEFAULT_CXX_STDLIB STREQUAL "libc++" AND (TARGET cxx OR HAVE_LIBCXX))
-    set(SANITIZER_CXX_ABI_LIBNAME "libc++")
-    set(SANITIZER_CXX_ABI_INTREE 1)
-  elseif (APPLE)
+  if (APPLE)
     set(SANITIZER_CXX_ABI_LIBNAME "libc++")
     set(SANITIZER_CXX_ABI_SYSTEM 1)
   elseif (FUCHSIA)
@@ -164,9 +161,7 @@
     "Compiler runtime to use.")
 
 if (COMPILER_RT_RUNTIME STREQUAL "default")
-  if (CLANG_DEFAULT_RTLIB STREQUAL "compiler-rt")
-    set(COMPILER_RT_RUNTIME_LIBRARY "builtins")
-  elseif (FUCHSIA)
+  if (FUCHSIA)
     set(COMPILER_RT_RUNTIME_LIBRARY "builtins")
   endif()
 else()