diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-25 17:41:38 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-25 17:41:38 -0400 |
commit | 47a0ed5924ea05ac58a9a36f60670b79e76c6273 (patch) | |
tree | 8ca62cd507cf100aeb1e4f66b495a01edb266efe /mesonbuild/modules/python.py | |
parent | 83c6fc5b0293c764ff5613a4976222fa51c3ca1d (diff) | |
download | meson-47a0ed5924ea05ac58a9a36f60670b79e76c6273.zip meson-47a0ed5924ea05ac58a9a36f60670b79e76c6273.tar.gz meson-47a0ed5924ea05ac58a9a36f60670b79e76c6273.tar.bz2 |
Revert "Windows: Improve Python 3.8+ module check on Windows"
This reverts commit 99ad11bd9c3249f548dda0b275d9f8dd1b3f6d14.
This breaks working setups in conda. It is either wrong or incomplete
and thus cannot be used.
Fixes #10737
Diffstat (limited to 'mesonbuild/modules/python.py')
-rw-r--r-- | mesonbuild/modules/python.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 9b50de4..6c5fcfe 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -765,22 +765,10 @@ class PythonModule(ExtensionModule): found_modules: T.List[str] = [] missing_modules: T.List[str] = [] if python.found() and want_modules: - # Python 3.8.x or later require add_dll_directory() to be called on Windows if - # the needed modules require external DLLs that are not bundled with the modules. - # Simplify things by calling add_dll_directory() on the paths in %PATH% - add_paths_cmd = '' - if hasattr(os, 'add_dll_directory'): - add_paths_cmds = [] - paths = os.environ['PATH'].split(os.pathsep) - for path in paths: - if path != '' and os.path.isdir(path): - add_paths_cmds.append(f'os.add_dll_directory({path!r})') - add_paths_cmd = 'import os;' + ';'.join(reversed(add_paths_cmds)) + ';' - for mod in want_modules: p, *_ = mesonlib.Popen_safe( python.command + - ['-c', f'{add_paths_cmd}import {mod}']) + ['-c', f'import {mod}']) if p.returncode != 0: missing_modules.append(mod) else: |