BUG: distutils: use AddDllDirectory where available

xoviat · hanjohn · commit 1fcb19492c5a · 2018-02-15T11:33:27.000-08:00
This should reduce some DLL hell scenarios, namely scipy/scipy#8064. partial credits to @carlkl
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
@@ -2289,10 +2289,25 @@ def generate_config_py(target):
 
     # For gfortran+msvc combination, extra shared libraries may exist
     f.write("""
+
 import os
-extra_dll_dir = os.path.join(os.path.dirname(__file__), '.libs')
-if os.path.isdir(extra_dll_dir):
-    os.environ["PATH"] += os.pathsep + extra_dll_dir
+import sys
+
+extra_dll_dir = os.path.join(os.path.dirname(__file__), 'extra-dll')
+
+if os.path.isdir(extra_dll_dir) and sys.platform == 'win32':
+    try:
+        from ctypes import windll, c_wchar_p
+        _AddDllDirectory = windll.kernel32.AddDllDirectory
+        _AddDllDirectory.argtypes = [c_wchar_p]
+        # Needed to initialize AddDllDirectory modifications
+        windll.kernel32.SetDefaultDllDirectories(0x1000)
+    except AttributeError:
+        def _AddDllDirectory(dll_directory):
+            os.environ["PATH"] += os.pathsep + dll_directory
+
+    _AddDllDirectory(extra_dll_dir)
+
 """)
 
     for k, i in system_info.saved_results.items():
