mirror of
https://gitlab.com/ita1024/waf.git
synced 2024-11-26 11:51:20 +01:00
Regression caused by 588f809ffa
- https://github.com/waf-project/waf/pull/1572
This commit is contained in:
parent
4adc55a9c9
commit
802e937d73
@ -462,7 +462,7 @@ def check_python_version(conf, minver=None):
|
||||
"get_python_lib(standard_lib=0) or ''"])
|
||||
else:
|
||||
python_LIBDEST = None
|
||||
(pydir,) = conf.get_python_variables( ["get_python_lib(standard_lib=0, prefix='%s') or ''" % conf.env['PREFIX']])
|
||||
(pydir,) = conf.get_python_variables( ["get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env.PREFIX])
|
||||
if python_LIBDEST is None:
|
||||
if conf.env['LIBDIR']:
|
||||
python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
|
||||
@ -477,7 +477,7 @@ def check_python_version(conf, minver=None):
|
||||
pyarchdir = conf.environ['PYTHONARCHDIR']
|
||||
else:
|
||||
# Finally, try to guess
|
||||
(pyarchdir, ) = conf.get_python_variables( ["get_python_lib(plat_specific=1, standard_lib=0, prefix='%s') or ''" % conf.env['PREFIX']])
|
||||
(pyarchdir, ) = conf.get_python_variables( ["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''" % conf.env.PREFIX])
|
||||
if not pyarchdir:
|
||||
pyarchdir = pydir
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user