drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[buildcore] Remove duplicate defines and add extra detection for Python 3

Browse Source
This commit is contained in:
Gary Talent 2021-07-29 02:59:59 -05:00
parent 5b9e1928d9
commit 99d342b8b3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/buildcore/base.mk vendored
View File

@ -16,13 +16,15 @@ else
HOST_ENV=${OS}-$(shell uname -m) HOST_ENV=${OS}-$(shell uname -m)
endif endif
ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
PYTHON3=python
else
PYTHON3=python3
endif
SCRIPTS=${BUILDCORE_PATH}/scripts SCRIPTS=${BUILDCORE_PATH}/scripts
SETUP_BUILD=python3 ${SCRIPTS}/setup-build.py SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
PYBB=python3 ${SCRIPTS}/pybb.py PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
CMAKE_BUILD=${PYBB} cmake-build
RM_RF=${PYBB} rm
SETUP_BUILD=python3 ${SCRIPTS}/setup-build.py
PYBB=python3 ${SCRIPTS}/pybb.py
CMAKE_BUILD=${PYBB} cmake-build CMAKE_BUILD=${PYBB} cmake-build
RM_RF=${PYBB} rm RM_RF=${PYBB} rm
ifdef USE_VCPKG ifdef USE_VCPKG