Index: cfe/trunk/CMakeLists.txt =================================================================== --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -129,7 +129,6 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) if(LLVM_INCLUDE_TESTS) - set(Python_ADDITIONAL_VERSIONS 2.7) include(FindPythonInterp) if(NOT PYTHONINTERP_FOUND) message(FATAL_ERROR Index: compiler-rt/trunk/CMakeLists.txt =================================================================== --- compiler-rt/trunk/CMakeLists.txt +++ compiler-rt/trunk/CMakeLists.txt @@ -80,7 +80,6 @@ endif() # Find Python interpreter. - set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5) include(FindPythonInterp) if(NOT PYTHONINTERP_FOUND) message(FATAL_ERROR " Index: lld/trunk/CMakeLists.txt =================================================================== --- lld/trunk/CMakeLists.txt +++ lld/trunk/CMakeLists.txt @@ -56,7 +56,6 @@ include(HandleLLVMOptions) if(LLVM_INCLUDE_TESTS) - set(Python_ADDITIONAL_VERSIONS 2.7) include(FindPythonInterp) if(NOT PYTHONINTERP_FOUND) message(FATAL_ERROR Index: llvm/trunk/CMakeLists.txt =================================================================== --- llvm/trunk/CMakeLists.txt +++ llvm/trunk/CMakeLists.txt @@ -642,8 +642,6 @@ include(HandleLLVMOptions) -# We support both Python 2 and 3. -set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 2.7) include(FindPythonInterp) if( NOT PYTHONINTERP_FOUND ) message(FATAL_ERROR Index: llvm/trunk/docs/GettingStarted.rst =================================================================== --- llvm/trunk/docs/GettingStarted.rst +++ llvm/trunk/docs/GettingStarted.rst @@ -598,6 +598,11 @@ | CMAKE_INSTALL_PREFIX | Specifies the install directory to target when | | | running the install action of the build files. | +-------------------------+----------------------------------------------------+ +| PYTHON_EXECUTABLE | Forces CMake to use a specific Python version by | +| | passing a path to a Python interpreter. By default | +| | the Python version of the interpreter in your PATH | +| | is used. | ++-------------------------+----------------------------------------------------+ | LLVM_TARGETS_TO_BUILD | A semicolon delimited list controlling which | | | targets will be built and linked into llvm. | | | The default list is defined as |