Merge pull request #8356 from rolk/8356_mingw_virtenv

Allow extensions to be built with MinGW in a virtualenv

1 files changed, 24 insertions, 6 deletions

diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index 1e56f9dd7..3a75a70e8 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -253,10 +253,11 @@ def find_python_dll():
     print("Looking for %s" % dllname)
 
     # We can't do much here:
-    # - find it in python main dir
+    # - find it in the virtualenv (sys.prefix)
+    # - find it in python main dir (sys.base_prefix, if in a virtualenv)
     # - in system32,
     # - ortherwise (Sxs), I don't know how to get it.
-    lib_dirs = [sys.prefix, os.path.join(sys.prefix, 'lib')]
+    lib_dirs = [sys.prefix, sys.base_prefix, os.path.join(sys.prefix, 'lib')]
     try:
         lib_dirs.append(os.path.join(os.environ['SYSTEMROOT'], 'system32'))
     except KeyError:
@@ -403,6 +404,12 @@ def _build_import_library_amd64():
                   (out_file))
         return
 
+    # didn't exist in virtualenv, maybe in base distribution?
+    base_file = os.path.join(sys.base_prefix, 'libs', out_name)
+    if os.path.isfile(base_file):
+        log.debug('Skip building import library: "%s" exists', base_file)
+        return
+
     def_name = "python%d%d.def" % tuple(sys.version_info[:2])
     def_file = os.path.join(sys.prefix, 'libs', def_name)
 
@@ -422,12 +429,23 @@ def _build_import_library_x86():
     out_name = "libpython%d%d.a" % tuple(sys.version_info[:2])
     out_file = os.path.join(sys.prefix, 'libs', out_name)
     if not os.path.isfile(lib_file):
-        log.warn('Cannot build import library: "%s" not found' % (lib_file))
-        return
+        # didn't find library file in virtualenv, try base distribution, too,
+        # and use that instead if found there
+        base_lib = os.path.join(sys.base_prefix, 'libs', lib_name)
+        if os.path.isfile(base_lib):
+            lib_file = base_lib
+        else:
+            log.warn('Cannot build import library: "%s" not found', lib_file)
+            return
     if os.path.isfile(out_file):
-        log.debug('Skip building import library: "%s" exists' % (out_file))
+        log.debug('Skip building import library: "%s" exists', out_file)
+        return
+    # didn't find in virtualenv, try base distribution, too
+    base_file = os.path.join(sys.base_prefix, 'libs', out_name)
+    if os.path.isfile(base_file):
+        log.debug('Skip building import library: "%s" exists', out_file)
         return
-    log.info('Building import library (ARCH=x86): "%s"' % (out_file))
+    log.info('Building import library (ARCH=x86): "%s"', out_file)
 
     from numpy.distutils import lib2def