Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use $(PYTHON3) instead of $(PYTHON) in make actions #3815

Merged
merged 1 commit into from
Dec 11, 2020
Merged

Use $(PYTHON3) instead of $(PYTHON) in make actions #3815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions py/mkenv.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RM = rm
RSYNC = rsync
SED = sed
# Linux has 'nproc', macOS has 'sysctl -n hw.logicalcpu', this is cross-platform
NPROC = $(PYTHON) -c 'import multiprocessing as mp; print(mp.cpu_count())'
NPROC = $(PYTHON3) -c 'import multiprocessing as mp; print(mp.cpu_count())'

AS = $(CROSS_COMPILE)as
CC = $(CROSS_COMPILE)gcc
Expand All @@ -72,7 +72,7 @@ CXX += -m32
LD += -m32
endif

MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py
MAKE_FROZEN = $(PYTHON3) $(TOP)/tools/make-frozen.py
MPY_CROSS = $(TOP)/mpy-cross/mpy-cross
MPY_TOOL = $(PYTHON3) $(TOP)/tools/mpy-tool.py
PREPROCESS_FROZEN_MODULES = PYTHONPATH=$(TOP)/tools/python-semver $(TOP)/tools/preprocess_frozen_modules.py
Expand Down