From c0081619e683d4f4e5db084157dc799063a28a28 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 3 Aug 2022 00:47:08 -0500 Subject: [PATCH] [buildcore] Put Python detection inside ENV_RUN call --- deps/buildcore/base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/buildcore/base.mk b/deps/buildcore/base.mk index b5748f09..d2987d17 100644 --- a/deps/buildcore/base.mk +++ b/deps/buildcore/base.mk @@ -24,7 +24,7 @@ ifneq ($(shell which docker 2> /dev/null),) endif endif -ifneq ($(shell which python3 2> /dev/null),) +ifneq ($(shell ${ENV_RUN} which python3 2> /dev/null),) PYTHON3=python3 else ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3) @@ -54,7 +54,7 @@ else endif 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 build: