mirror of https://gitlab.com/ita1024/waf.git
Keep opt.load('python') optional
This commit is contained in:
parent
4c9ee84194
commit
17015626e2
|
@ -584,14 +584,14 @@ def configure(conf):
|
||||||
Detect the python interpreter
|
Detect the python interpreter
|
||||||
"""
|
"""
|
||||||
v = conf.env
|
v = conf.env
|
||||||
if Options.options.pythondir:
|
if getattr(Options.options, 'pythondir', None):
|
||||||
v.PYTHONDIR = Options.options.pythondir
|
v.PYTHONDIR = Options.options.pythondir
|
||||||
if Options.options.pythonarchdir:
|
if getattr(Options.options, 'pythonarchdir', None):
|
||||||
v.PYTHONARCHDIR = Options.options.pythonarchdir
|
v.PYTHONARCHDIR = Options.options.pythonarchdir
|
||||||
if Options.options.nopycache:
|
if getattr(Options.options, 'nopycache', None):
|
||||||
v.NOPYCACHE=Options.options.nopycache
|
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 = ''
|
||||||
v.PYFLAGS_OPT = '-O'
|
v.PYFLAGS_OPT = '-O'
|
||||||
|
|
Loading…
Reference in New Issue