From b9df5b205ead85f813eca196a7aa37d88f09bcbe Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Fri, 14 Apr 2017 01:54:19 +0200 Subject: [PATCH] Detect Python from conf.env.PYTHON --- waflib/Tools/python.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waflib/Tools/python.py b/waflib/Tools/python.py index de392248..b0424394 100644 --- a/waflib/Tools/python.py +++ b/waflib/Tools/python.py @@ -591,7 +591,10 @@ def configure(conf): if getattr(Options.options, 'nopycache', None): v.NOPYCACHE=Options.options.nopycache - conf.find_program('python', var='PYTHON', value=getattr(Options.options, 'python', None) or sys.executable) + if not v.PYTHON: + v.PYTHON = getattr(Options.options, 'python', None) or sys.executable + v.PYTHON = Utils.to_list(v.PYTHON) + conf.find_program('python', var='PYTHON') v.PYFLAGS = '' v.PYFLAGS_OPT = '-O'