diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-30 11:19:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-30 11:51:17 +0300 |
| commit | 64c8e9a2196f657261e737ba62d1cb479e04a518 (patch) | |
| tree | 215968973f70fbaa6fa28d8099a8c48f41bf4099 /GNUmakefile | |
| parent | a6a0a091978d09ffa85306dcabb671370a5bb322 (diff) | |
macOS: don't require python3 to be installed to run "make update"
And fall back to python3 from our libraries for other commands, once checked
out with make update.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index d960a67e407..e52fd38a7e3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -192,6 +192,16 @@ ifndef PYTHON PYTHON:=python3 endif +# For macOS python3 is not installed by default, so fallback to python binary +# in libraries, or python 2 for running make update to get it. +ifeq ($(OS_NCASE),darwin) + ifeq (, $(shell command -v $(PYTHON))) + PYTHON:=../lib/darwin/python/bin/python3.7m + ifeq (, $(shell command -v $(PYTHON))) + PYTHON:=python + endif + endif +endif # ----------------------------------------------------------------------------- # additional targets for the build configuration @@ -374,7 +384,7 @@ package_archive: .FORCE # Tests # test: .FORCE - python3 ./build_files/utils/make_test.py "$(BUILD_DIR)" + $(PYTHON) ./build_files/utils/make_test.py "$(BUILD_DIR)" # run pep8 check check on scripts we distribute. test_pep8: .FORCE @@ -530,11 +540,11 @@ icons_geom: .FORCE "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py" update: .FORCE - python3 ./build_files/utils/make_update.py + $(PYTHON) ./build_files/utils/make_update.py format: .FORCE PATH="../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \ - python3 source/tools/utils_maintenance/clang_format_paths.py $(PATHS) + $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS) # ----------------------------------------------------------------------------- |