replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[CMake] Don't set Python_ADDITIONAL_VERSIONS 

Until recently, Python_ADDITIONAL_VERSIONS was used to limit LLVM's
Python support to 2.7. Now that both LLVM and LLDB both support Python
3, there's no longer a need to put an arbitrary limit on this.

However, instead of removing the variable, r365692 expanded the list,
which has the (presumably unintentional) side-effect of expression
preference for Python 3.

Instead, as Michal proposed in the original code review, we should just
not set the list at all, and let CMake pick whatever Python interpreter
you have in your path.

This patch removes the Python_ADDITIONAL_VERSIONS variable in llvm,
clang and lld. I've also updated the docs with the default behavior and
how to force a different Python version to be used.

Differential revision: https://reviews.llvm.org/D64894

llvm-svn: 366447
This commit is contained in:
Jonas Devlieghere 2019-07-18 15:17:42 +00:00
parent ac958c2ed6
commit a5359b1b07
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/CMakeLists.txt
View File

@ -129,7 +129,6 @@ 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)
set(Python_ADDITIONAL_VERSIONS 2.7)
include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND)
message(FATAL_ERROR

1
compiler-rt/CMakeLists.txt
View File

@ -80,7 +80,6 @@ if (COMPILER_RT_STANDALONE_BUILD)
endif()
# Find Python interpreter.
set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5)
include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND)
message(FATAL_ERROR "

1
lld/CMakeLists.txt
View File

@ -56,7 +56,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
include(HandleLLVMOptions)
if(LLVM_INCLUDE_TESTS)
set(Python_ADDITIONAL_VERSIONS 2.7)
include(FindPythonInterp)
if(NOT PYTHONINTERP_FOUND)
message(FATAL_ERROR

2
llvm/CMakeLists.txt
View File

@ -642,8 +642,6 @@ option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default
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

5
llvm/docs/GettingStarted.rst
View File

@ -598,6 +598,11 @@ used by people developing LLVM.
| 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 |