[llvm] r366447 - [CMake] Don't set Python_ADDITIONAL_VERSIONS

[Hans Wennborg via llvm-commits]

Merged to release_90 in r369899, r369900, r369901, r369902 (for llvm,
cfe, lld, compiler-rt, respectively).

On Thu, Jul 18, 2019 at 5:17 PM Jonas Devlieghere via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: jdevlieghere
> Date: Thu Jul 18 08:17:42 2019
> New Revision: 366447
>
> URL: http://llvm.org/viewvc/llvm-project?rev=366447&view=rev
> Log:
> [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
>
> Modified:
>     llvm/trunk/CMakeLists.txt
>     llvm/trunk/docs/GettingStarted.rst
>
> Modified: llvm/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=366447&r1=366446&r2=366447&view=diff
> ==============================================================================
> --- llvm/trunk/CMakeLists.txt (original)
> +++ llvm/trunk/CMakeLists.txt Thu Jul 18 08:17:42 2019
> @@ -642,8 +642,6 @@ option(LLVM_ENABLE_PLUGINS "Enable plugi
>
>  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
>
> Modified: llvm/trunk/docs/GettingStarted.rst
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStarted.rst?rev=366447&r1=366446&r2=366447&view=diff
> ==============================================================================
> --- llvm/trunk/docs/GettingStarted.rst (original)
> +++ llvm/trunk/docs/GettingStarted.rst Thu Jul 18 08:17:42 2019
> @@ -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                     |
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits