Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
0fd66b4f
Commit
0fd66b4f
authored
Feb 14, 2022
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
GNUmakefile: use PYTHON variable instead of python3
Also update the Python3 binary on macOS.
parent
7d5f6c33
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
GNUmakefile
+3
-3
3 additions, 3 deletions
GNUmakefile
with
3 additions
and
3 deletions
GNUmakefile
+
3
−
3
View file @
0fd66b4f
...
@@ -204,7 +204,7 @@ endif
...
@@ -204,7 +204,7 @@ endif
# in libraries, or python 2 for running make update to get it.
# in libraries, or python 2 for running make update to get it.
ifeq
($(OS_NCASE),darwin)
ifeq
($(OS_NCASE),darwin)
ifeq
(, $(shell command -v $(PYTHON)))
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)))
ifeq
(, $(shell command -v $(PYTHON)))
PYTHON
:=
python
PYTHON
:=
python
endif
endif
...
@@ -509,14 +509,14 @@ check_licenses: .FORCE
...
@@ -509,14 +509,14 @@ check_licenses: .FORCE
#
#
source_archive
:
.FORCE
source_archive
:
.FORCE
python3
./build_files/utils/make_source_archive.py
$(
PYTHON
)
./build_files/utils/make_source_archive.py
source_archive_complete
:
.FORCE
source_archive_complete
:
.FORCE
cmake
\
cmake
\
-S
"
$(
BLENDER_DIR
)
/build_files/build_environment"
-B
"
$(
BUILD_DIR
)
/source_archive"
\
-S
"
$(
BLENDER_DIR
)
/build_files/build_environment"
-B
"
$(
BUILD_DIR
)
/source_archive"
\
-DCMAKE_BUILD_TYPE_INIT
:STRING
=
$(
BUILD_TYPE
)
-DPACKAGE_USE_UPSTREAM_SOURCES
=
OFF
-DCMAKE_BUILD_TYPE_INIT
:STRING
=
$(
BUILD_TYPE
)
-DPACKAGE_USE_UPSTREAM_SOURCES
=
OFF
# This assumes CMake is still using a default `PACKAGE_DIR` variable:
# 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"
INKSCAPE_BIN
?=
"inkscape"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment