diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index f947b820bdac..f1e5a39cfe05 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -135,20 +135,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) if(LLVM_INCLUDE_TESTS) - find_package(Python3 COMPONENTS Interpreter) - if(NOT Python3_Interpreter_FOUND) - message(WARNING "Python3 not found, using python2 as a fallback") - find_package(Python2 COMPONENTS Interpreter REQUIRED) - if(Python2_VERSION VERSION_LESS 2.7) - message(SEND_ERROR "Python 2.7 or newer is required") - endif() - - # Treat python2 as python3 - add_executable(Python3::Interpreter IMPORTED) - set_target_properties(Python3::Interpreter PROPERTIES - IMPORTED_LOCATION ${Python2_EXECUTABLE}) - set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) - endif() + find_package(Python3 REQUIRED COMPONENTS Interpreter) # Check prebuilt llvm/utils. if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX} diff --git a/clang/tools/scan-build-py/README.md b/clang/tools/scan-build-py/README.md index 0f89b6fa43d8..63ce0273f22e 100644 --- a/clang/tools/scan-build-py/README.md +++ b/clang/tools/scan-build-py/README.md @@ -19,7 +19,7 @@ Should be working on UNIX operating systems. Prerequisites ------------- -1. **python** interpreter (version 2.7, 3.2, 3.3, 3.4, 3.5). +1. **python** interpreter (version 3.6 or later). How to use diff --git a/clang/tools/scan-build/bin/set-xcode-analyzer b/clang/tools/scan-build/bin/set-xcode-analyzer index c2a65c908598..9faaec1e8e6e 100755 --- a/clang/tools/scan-build/bin/set-xcode-analyzer +++ b/clang/tools/scan-build/bin/set-xcode-analyzer @@ -5,8 +5,8 @@ # This one has the scripting bridge enabled. import sys -if sys.version_info < (2, 7): - print "set-xcode-analyzer requires Python 2.7 or later" +if sys.version_info < (3, 6): + print "set-xcode-analyzer requires Python 3.6 or later" sys.exit(1) import os diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index 82b4b9b9b198..d4e561b50d8f 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt @@ -57,20 +57,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) include(CheckAtomic) if(LLVM_INCLUDE_TESTS) - find_package(Python3 COMPONENTS Interpreter) - if(NOT Python3_Interpreter_FOUND) - message(WARNING "Python3 not found, using python2 as a fallback") - find_package(Python2 COMPONENTS Interpreter REQUIRED) - if(Python2_VERSION VERSION_LESS 2.7) - message(SEND_ERROR "Python 2.7 or newer is required") - endif() - - # Treat python2 as python3 - add_executable(Python3::Interpreter IMPORTED) - set_target_properties(Python3::Interpreter PROPERTIES - IMPORTED_LOCATION ${Python2_EXECUTABLE}) - set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) - endif() + find_package(Python3 REQUIRED COMPONENTS Interpreter) # Check prebuilt llvm/utils. if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX} diff --git a/lldb/docs/resources/build.rst b/lldb/docs/resources/build.rst index b4e58ca977a9..8aadd126ed0b 100644 --- a/lldb/docs/resources/build.rst +++ b/lldb/docs/resources/build.rst @@ -73,7 +73,7 @@ commands below. > yum install libedit-devel libxml2-devel ncurses-devel python-devel swig > sudo apt-get install build-essential subversion swig python3-dev libedit-dev libncurses5-dev > pkg install swig python - > pkgin install swig python27 cmake ninja-build + > pkgin install swig python36 cmake ninja-build > brew install swig cmake ninja Note that there's an `incompatibility diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 54009573ed43..ee1b646ab651 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -708,20 +708,7 @@ set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER FALSE CACHE BOOL include(HandleLLVMOptions) -find_package(Python3 COMPONENTS Interpreter) -if(NOT Python3_Interpreter_FOUND) - message(WARNING "Python3 not found, using python2 as a fallback") - find_package(Python2 COMPONENTS Interpreter REQUIRED) - if(Python2_VERSION VERSION_LESS 2.7) - message(SEND_ERROR "Python 2.7 or newer is required") - endif() - - # Treat python2 as python3 - add_executable(Python3::Interpreter IMPORTED) - set_target_properties(Python3::Interpreter PROPERTIES - IMPORTED_LOCATION ${Python2_EXECUTABLE}) - set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) -endif() +find_package(Python3 REQUIRED COMPONENTS Interpreter) ###### diff --git a/llvm/docs/GettingStarted.rst b/llvm/docs/GettingStarted.rst index 05d2994fed2b..d4e4a3b03928 100644 --- a/llvm/docs/GettingStarted.rst +++ b/llvm/docs/GettingStarted.rst @@ -170,7 +170,7 @@ Package Version Notes =========================================================== ============ ========================================== `CMake `__ >=3.13.4 Makefile/workspace generator `GCC `_ >=5.1.0 C/C++ compiler\ :sup:`1` -`python `_ >=2.7 Automated test suite\ :sup:`2` +`python `_ >=3.6 Automated test suite\ :sup:`2` `zlib `_ >=1.2.3.4 Compression library\ :sup:`3` `GNU Make `_ 3.79, 3.79.1 Makefile/build processor\ :sup:`4` =========================================================== ============ ========================================== diff --git a/llvm/docs/GettingStartedVS.rst b/llvm/docs/GettingStartedVS.rst index 84d0ecf4d8fa..2ed4397ac39f 100644 --- a/llvm/docs/GettingStartedVS.rst +++ b/llvm/docs/GettingStartedVS.rst @@ -51,7 +51,7 @@ You will also need the `CMake `_ build system since it generates the project files you will use to build with. If you would like to run the LLVM tests you will need `Python -`_. Version 2.7 and newer are known to work. You will +`_. Version 3.6 and newer are known to work. You will need `GnuWin32 `_ tools, too. Do not install the LLVM directory tree into a path containing spaces (e.g. diff --git a/llvm/docs/HowToBuildOnARM.rst b/llvm/docs/HowToBuildOnARM.rst index f28f8b3ae2d5..9eb6b5a2ca12 100644 --- a/llvm/docs/HowToBuildOnARM.rst +++ b/llvm/docs/HowToBuildOnARM.rst @@ -41,7 +41,6 @@ on the ARMv6 and ARMv7 architectures and may be inapplicable to older chips. Use Ninja instead of Make: "-G Ninja" Build with assertions on: "-DLLVM_ENABLE_ASSERTIONS=True" - Force Python2: "-DPYTHON_EXECUTABLE=/usr/bin/python2" Local (non-sudo) install path: "-DCMAKE_INSTALL_PREFIX=$HOME/llvm/install" CPU flags: "DCMAKE_C_FLAGS=-mcpu=cortex-a15" (same for CXX_FLAGS) diff --git a/llvm/docs/TestingGuide.rst b/llvm/docs/TestingGuide.rst index 4ca1a359b64c..0f9129205756 100644 --- a/llvm/docs/TestingGuide.rst +++ b/llvm/docs/TestingGuide.rst @@ -23,7 +23,7 @@ Requirements ============ In order to use the LLVM testing infrastructure, you will need all of the -software required to build LLVM, as well as `Python `_ 2.7 or +software required to build LLVM, as well as `Python `_ 3.6 or later. LLVM Testing Infrastructure Organization