diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-08-17 17:03:06 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-08-18 17:58:30 -0400 |
| commit | b0ffb80ecf845c71453aa34c05570b0c3122db3f (patch) | |
| tree | 0be5f673fdd5db86e7cebbf655cdae28d20dd9df /mesonbuild/modules/python.py | |
| parent | 44e123dd90d0af9af5dcec494aa13e1f278fdaca (diff) | |
| download | meson-b0ffb80ecf845c71453aa34c05570b0c3122db3f.zip meson-b0ffb80ecf845c71453aa34c05570b0c3122db3f.tar.gz meson-b0ffb80ecf845c71453aa34c05570b0c3122db3f.tar.bz2 | |
python module: fix extensions without explicit subdir being installed to libdir
They are documented to go in site-packages, and indeed belong there.
Regression from the initial implementation via commit ad296976f079cd185ab7361e3e4b18c6bf684090
Fixes #6331
Diffstat (limited to 'mesonbuild/modules/python.py')
| -rw-r--r-- | mesonbuild/modules/python.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 1e301bd..279e297 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -409,10 +409,10 @@ class PythonInstallation(ExternalProgramHolder): @permittedKwargs(mod_kwargs) def extension_module_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> 'SharedModule': - if 'subdir' in kwargs and 'install_dir' in kwargs: - raise InvalidArguments('"subdir" and "install_dir" are mutually exclusive') - - if 'subdir' in kwargs: + if 'install_dir' in kwargs: + if 'subdir' in kwargs: + raise InvalidArguments('"subdir" and "install_dir" are mutually exclusive') + else: subdir = kwargs.pop('subdir', '') if not isinstance(subdir, str): raise InvalidArguments('"subdir" argument must be a string.') |