Commit: 0fd66b4f0723291d26b640190a0d751218f78a80
Author: Campbell Barton
Date: Mon Feb 14 16:04:31 2022 +1100
Branches: master
https://developer.blender.org/rB0fd66b4f0723291d26b640190a0d751218f78a80
GNUmakefile: use PYTHON variable instead of python3
Also update the Python3 binary on macOS.
===================================================================
M GNUmakefile
===================================================================
diff --git a/GNUmakefile b/GNUmakefile
index 67620e3ec48..f20f54ea95f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -204,7 +204,7 @@ endif
# in libraries, or python 2 for running make update to get it.
ifeq ($(OS_NCASE),darwin)
ifeq (, $(shell command -v $(PYTHON)))
- PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.7m
+ PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.10
ifeq (, $(shell command -v $(PYTHON)))
PYTHON:=python
endif
@@ -509,14 +509,14 @@ check_licenses: .FORCE
#
source_archive: .FORCE
- python3 ./build_files/utils/make_source_archive.py
+ $(PYTHON) ./build_files/utils/make_source_archive.py
source_archive_complete: .FORCE
cmake \
-S "$(BLENDER_DIR)/build_files/build_environment"
-B"$(BUILD_DIR)/source_archive" \
-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE)
-DPACKAGE_USE_UPSTREAM_SOURCES=OFF
# This assumes CMake is still using a default `PACKAGE_DIR` variable:
- python3 ./build_files/utils/make_source_archive.py --include-packages
"$(BUILD_DIR)/source_archive/packages"
+ $(PYTHON) ./build_files/utils/make_source_archive.py --include-packages
"$(BUILD_DIR)/source_archive/packages"
INKSCAPE_BIN?="inkscape"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
