From d41270b80130b6e8012f16b31ea0c6260e75b5b8 Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Tue, 7 Jan 2020 10:44:03 -0400 Subject: [PATCH] More disambiguation of Python in makefiles (mono/mono#18284) Commit migrated from https://github.com/mono/mono/commit/b3ce5bfa887e4542b5360e51f2a8ae483b58e07a --- src/mono/mono/tests/Makefile.am | 2 +- src/mono/netcore/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/mono/tests/Makefile.am b/src/mono/mono/tests/Makefile.am index e7ce0f0..58a6215 100755 --- a/src/mono/mono/tests/Makefile.am +++ b/src/mono/mono/tests/Makefile.am @@ -3189,7 +3189,7 @@ coreclr-gcstress: # Tests for the Mono lldb plugin EXTRA_DIST += test_lldb.py test-lldb.cs test-lldb: test-lldb.exe - python test_lldb.py $(JITTEST_PROG) + $(PYTHON) test_lldb.py $(JITTEST_PROG) if !ENABLE_MSVC_ONLY diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile index fb9888f..7c56582 100755 --- a/src/mono/netcore/Makefile +++ b/src/mono/netcore/Makefile @@ -19,7 +19,7 @@ ifeq ($(HOST_PLATFORM),win32) PLATFORM_AOT_SUFFIX := .dll PLATFORM_AOT_PREFIX := NETCORESDK_EXT = zip -UNZIPCMD = python -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1], 'r').extractall()" +UNZIPCMD = $(PYTHON) -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1], 'r').extractall()" XUNIT_INNER_ARGS = -notrait category=nonwindowstests @../../../../CoreFX.issues_windows.rsp TESTS_PLATFORM = Windows_NT.x64 ON_RUNTIME_EXTRACT = chmod -R 755 {host,shared,./dotnet} @@ -320,4 +320,4 @@ jitdiff: cd tools/jitdiff && $(DOTNET) run -c Release -- "$(BEFORE)" "$(AFTER)" distdir: -distclean: \ No newline at end of file +distclean: -- 2.7.4