From 65b5a3966da2dd0d1c66e4c848448b777fa02832 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 13 Apr 2017 12:11:36 +0200 Subject: [PATCH] Keep opt.load('python') optional --- waflib/Tools/python.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/waflib/Tools/python.py b/waflib/Tools/python.py index 564422af..b8c29829 100644 --- a/waflib/Tools/python.py +++ b/waflib/Tools/python.py @@ -584,14 +584,14 @@ def configure(conf): Detect the python interpreter """ v = conf.env - if Options.options.pythondir: + if getattr(Options.options, 'pythondir', None): v.PYTHONDIR = Options.options.pythondir - if Options.options.pythonarchdir: + if getattr(Options.options, 'pythonarchdir', None): v.PYTHONARCHDIR = Options.options.pythonarchdir - if Options.options.nopycache: + if getattr(Options.options, 'nopycache', None): v.NOPYCACHE=Options.options.nopycache - conf.find_program('python', var='PYTHON', value=Options.options.python or sys.executable) + conf.find_program('python', var='PYTHON', value=getattr(Options.options, 'python', sys.executable)) v.PYFLAGS = '' v.PYFLAGS_OPT = '-O'