adding additional conditional for distutils installed on 64bit archit…

…ectures.
toumorokoshi · Aug 20, 2016 · 5b29a67 · 5b29a67
1 parent 6a6e831
commit 5b29a67
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 ]
 
 setup(name='uranium',
-      version='0.2.45b',
+      version='0.2.49b',
       description='a build system for python',
       long_description=open('README.rst').read(),
       author='Yusuke Tsutsumi',

diff --git a/uranium/lib/sandbox/venv/activate.py b/uranium/lib/sandbox/venv/activate.py
@@ -60,9 +60,14 @@ def _clean_package_resources(_pkg_resources, old_prefix):
 
 
 def _load_distutils(root):
-    distutils_path = os.path.join(root, 'lib', 'python%s' % sys.version[:3], 'distutils', '__init__.py')
-    with open(distutils_path) as f:
-        exec(f.read(), {
-            "__file__": distutils_path,
-            "__path__": []
-        })
+    distutils_path_candidates = [
+        os.path.join(root, 'lib', 'python%s' % sys.version[:3], 'distutils', '__init__.py'),
+        os.path.join(root, 'lib64', 'python%s' % sys.version[:3], 'distutils', '__init__.py')
+    ]
+    for p in distutils_path_candidates:
+        if os.path.exists(p):
+            with open(p) as f:
+                exec(f.read(), {
+                    "__file__": p,
+                    "__path__": []
+                })