2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-26 11:51:20 +01:00

Keep opt.load('python') optional

This commit is contained in:
Thomas Nagy 2017-04-13 12:11:36 +02:00
parent 4c9ee84194
commit 17015626e2
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA

View File

@ -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'