diff options
| -rw-r--r-- | lib/talloc/wscript | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 0274dc0eeff..ab74e727950 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -74,19 +74,22 @@ def configure(conf): implied_deps='replace'): conf.define('USING_SYSTEM_TALLOC', 1) - using_system_pytalloc_util = True - if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): + if conf.env.disable_python: using_system_pytalloc_util = False - - # We need to get a pytalloc-util for all the python versions - # we are building for - if conf.env['EXTRA_PYTHON']: - name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] - if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, + else: + using_system_pytalloc_util = True + if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, implied_deps='talloc replace'): using_system_pytalloc_util = False + # We need to get a pytalloc-util for all the python versions + # we are building for + if conf.env['EXTRA_PYTHON']: + name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] + if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, + implied_deps='talloc replace'): + using_system_pytalloc_util = False + if using_system_pytalloc_util: conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) |