Revert r256606 due to compiler-rt sanitizer bot failures

llvm-svn: 256614

1 files changed, 10 insertions, 31 deletions

diff --git a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
index 29347dc8fe1..6215be7f586 100644
--- a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
+++ b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
@@ -1,6 +1,4 @@
-
-
-macro(internal_find_llvm_parts)
+macro(find_llvm_parts)
 # Rely on llvm-config.
   set(CONFIG_OUTPUT)
   find_program(LLVM_CONFIG "llvm-config")
@@ -59,13 +57,16 @@ macro(internal_find_llvm_parts)
   list(APPEND CMAKE_MODULE_PATH "${LLVM_MAIN_SRC_DIR}/cmake/modules")
 
   set(LLVM_FOUND ON)
-endmacro(internal_find_llvm_parts)
+endmacro(find_llvm_parts)
 
 
-macro(internal_simulate_llvm_options)
-  # LLVM Options --------------------------------------------------------------
-  # Configure the LLVM CMake options expected by libc++.
+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+  set(LIBCXX_BUILT_STANDALONE 1)
+  message(STATUS "Configuring for standalone build.")
 
+  find_llvm_parts()
+
+  # LLVM Options --------------------------------------------------------------
   include(FindPythonInterp)
   if( NOT PYTHONINTERP_FOUND )
     message(WARNING "Failed to find python interpreter. "
@@ -131,29 +132,7 @@ macro(internal_simulate_llvm_options)
       MESSAGE(SEND_ERROR "Unable to determine platform")
     endif(UNIX)
   endif(WIN32)
-endmacro(internal_simulate_llvm_options)
-
-
-macro(handle_out_of_tree_llvm)
-  # This macro should not be called unless we are building out of tree.
-  # Enforce that.
-  if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-    message(FATAL_ERROR "libc++ incorrectly configured for out-of-tree LLVM")
-  endif()
-
-  # Attempt to find an LLVM installation and source directory. Warn if they
-  # are not found.
-  internal_find_llvm_parts()
-  if (NOT LLVM_FOUND)
-    message(WARNING "UNSUPPORTED LIBCXX CONFIGURATION DETECTED: "
-                    "llvm-config not found and LLVM_PATH not defined.\n"
-                    "Reconfigure with -DLLVM_CONFIG=path/to/llvm-config "
-                    "or -DLLVM_PATH=path/to/llvm-source-root.")
-  endif()
-
-  # Simulate the LLVM CMake options and variables provided by an in-tree LLVM.
-  internal_simulate_llvm_options()
 
-  # Additionally include the LLVM CMake functions if we can find the module.
+  # Add LLVM Functions --------------------------------------------------------
   include(AddLLVM OPTIONAL)
-endmacro()
+endif()