diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-01 22:03:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 22:03:43 +0300 |
| commit | 48a5d17830820e4729d252fc33c26fb9dac66404 (patch) | |
| tree | 9240fda2a4ad1cf178b75c16f6171e8d4d010427 /mesonbuild/modules/python.py | |
| parent | d3b389f349edf9fac12c3d40361ea0cd394926c0 (diff) | |
| parent | 94564b8f1a073a157f5698bf49cdea075dacc790 (diff) | |
| download | meson-48a5d17830820e4729d252fc33c26fb9dac66404.zip meson-48a5d17830820e4729d252fc33c26fb9dac66404.tar.gz meson-48a5d17830820e4729d252fc33c26fb9dac66404.tar.bz2 | |
Merge pull request #5873 from mesonbuild/py2optional
Make Python 2 tests optional(er) to prepare for py2 purge in Debian.
Diffstat (limited to 'mesonbuild/modules/python.py')
| -rw-r--r-- | mesonbuild/modules/python.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index fc9ec9b..7832eb8 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -115,7 +115,6 @@ class PythonDependency(ExternalDependency): self._find_libpy_windows(environment) else: self._find_libpy(python_holder, environment) - if self.is_found: mlog.debug('Found "python-{}" via SYSCONFIG module'.format(self.version)) py_lookup_method = 'sysconfig' @@ -123,7 +122,7 @@ class PythonDependency(ExternalDependency): if self.is_found: mlog.log('Dependency', mlog.bold(self.name), 'found:', mlog.green('YES ({})'.format(py_lookup_method))) else: - mlog.log('Dependency', mlog.bold(self.name), 'found:', [mlog.red('NO')]) + mlog.log('Dependency', mlog.bold(self.name), 'found:', mlog.red('NO')) def _find_libpy(self, python_holder, environment): if python_holder.is_pypy: @@ -145,7 +144,7 @@ class PythonDependency(ExternalDependency): if largs is not None: self.link_args = largs - self.is_found = largs is not None or not self.link_libpython + self.is_found = largs is not None or self.link_libpython inc_paths = mesonlib.OrderedSet([ self.variables.get('INCLUDEPY'), |