djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3815 from dhalbert/python3-mkenv-mk 

Use $(PYTHON3) instead of $(PYTHON) in make actions
This commit is contained in:
Scott Shawcroft 2020-12-11 11:08:15 -08:00 committed by GitHub
parent e9fd689d57 d83d46a52d
commit d920750756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/mkenv.mk
View File

@ -56,7 +56,7 @@ RM = rm
RSYNC = rsync RSYNC = rsync
SED = sed SED = sed
# Linux has 'nproc', macOS has 'sysctl -n hw.logicalcpu', this is cross-platform # 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 AS = $(CROSS_COMPILE)as
CC = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc
@ -72,7 +72,7 @@ CXX += -m32
LD += -m32 LD += -m32
endif 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_CROSS = $(TOP)/mpy-cross/mpy-cross
MPY_TOOL = $(PYTHON3) $(TOP)/tools/mpy-tool.py MPY_TOOL = $(PYTHON3) $(TOP)/tools/mpy-tool.py
PREPROCESS_FROZEN_MODULES = PYTHONPATH=$(TOP)/tools/python-semver $(TOP)/tools/preprocess_frozen_modules.py PREPROCESS_FROZEN_MODULES = PYTHONPATH=$(TOP)/tools/python-semver $(TOP)/tools/preprocess_frozen_modules.py