From 3bd775d6fad42c9f96d6c29a0c6d5e6cb8834fa2 Mon Sep 17 00:00:00 2001 From: Shunsuke Shimizu Date: Sun, 23 Jul 2017 17:36:54 +0900 Subject: [PATCH] Search lib directory suffixed by ABI (32 or 64), used in e.g. Gentoo Linux (#3211) --- mypy/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mypy/build.py b/mypy/build.py index 6effe8ad3944..93d62e50cabb 100644 --- a/mypy/build.py +++ b/mypy/build.py @@ -219,13 +219,14 @@ def default_data_dir(bin_dir: Optional[str]) -> str: # Installed in site-packages or dist-packages, but invoked with python3 -m mypy; # __file__ is .../blah/lib/python3.N/site-packages/mypy/build.py # or .../blah/lib/python3.N/dist-packages/mypy/build.py (Debian) + # or .../blah/lib64/python3.N/dist-packages/mypy/build.py (Gentoo) # or .../blah/lib/site-packages/mypy/build.py (Windows) # blah may be a virtualenv or /usr/local. We want .../blah/lib/mypy. lib = parent for i in range(2): lib = os.path.dirname(lib) - if os.path.basename(lib) == 'lib': - return os.path.join(lib, 'mypy') + if os.path.basename(lib) in ('lib', 'lib32', 'lib64'): + return os.path.join(os.path.dirname(lib), 'lib/mypy') subdir = os.path.join(parent, 'lib', 'mypy') if os.path.isdir(subdir): # If installed via buildout, the __file__ is