Revert r256606 due to compiler-rt sanitizer bot failures
llvm-svn: 256614
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: d888cf50c6ab8475c80ec2079dc11b3a6b923595
diff --git a/cmake/Modules/HandleOutOfTreeLLVM.cmake b/cmake/Modules/HandleOutOfTreeLLVM.cmake
index 29347dc..6215be7 100644
--- a/cmake/Modules/HandleOutOfTreeLLVM.cmake
+++ b/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 @@
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)
+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 --------------------------------------------------------------
- # Configure the LLVM CMake options expected by libc++.
-
include(FindPythonInterp)
if( NOT PYTHONINTERP_FOUND )
message(WARNING "Failed to find python interpreter. "
@@ -131,29 +132,7 @@
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()