Make Linux build python version agnostic #6732
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ppenzin
approved these changes
Jul 13, 2021
fatcerberus
reviewed
Jul 13, 2021
| @@ -127,7 +128,7 @@ CMAKE_EXPORT_COMPILE_COMMANDS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON" | |||
| LIBS_ONLY_BUILD= | |||
| ALWAYS_YES= | |||
| CCACHE_NAME= | |||
| PYTHON2_BINARY=$(which python2.7 || which python2 || which python 2> /dev/null) | |||
| PYTHON_BINARY=$(which python3 || which python || which python2.7 || which python2 || which python 2> /dev/null) | |||
There was a problem hiding this comment.
which python is called twice - is that intentional? It seems if the first one fails, the second will also.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ubuntu 20.04 comes with python3 only AND its shell python command is
python3notpython.Older linux distros come with python 2 only.
Two changes to handle this
build.shscript was dependent on finding python2, this change should cause it to function with python3 or python2jstoc.pyscript run as part of buildingchrequired a command linepythoncommand, this change asks CMake to locate a python executable and use it rather than relying on the existence of a command linepythoncommandNote this was not an issue in CI because:
a) we don't use
build.shin the CI ANDb) the CI machines have a symlink between
pythonandpython3- but this is something in azure CI, it's not default on a blank Ubuntu 20.04 distroCC @fatcerberus
Fix #6731