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

[buildcore] Put Python detection inside ENV_RUN call

Browse Source
This commit is contained in:
Gary Talent 2022-08-03 00:47:08 -05:00
parent a119f96a73
commit c0081619e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/buildcore/base.mk vendored
View File

@ -24,7 +24,7 @@ ifneq ($(shell which docker 2> /dev/null),)
endif endif
endif endif
ifneq ($(shell which python3 2> /dev/null),) ifneq ($(shell ${ENV_RUN} which python3 2> /dev/null),)
PYTHON3=python3 PYTHON3=python3
else else
ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3) ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3)
@ -54,7 +54,7 @@ else
endif endif
VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV) VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
CURRENT_BUILD=$(HOST_ENV)-$(shell ${PYBB} cat .current_build) CURRENT_BUILD=$(HOST_ENV)-$(shell ${ENV_RUN} ${PYBB} cat .current_build)
.PHONY: build .PHONY: build
build: build: