BLD: mingwpy fixes

1 files changed, 15 insertions, 2 deletions

diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 75d864c5a..f5ef1f9b9 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -381,9 +381,22 @@ def mingw32():
     """Return true when using mingw32 environment.
     """
     if sys.platform=='win32':
-        if os.environ.get('OSTYPE', '')=='msys':
+        # mingw32 compiler configured in %USERPROFILE%\pydistutils.cfg 
+        # or distutils\distutils.cfg
+        from distutils.dist import Distribution
+        _dist = Distribution()
+        _dist.parse_config_files()
+        _bld = _dist.get_option_dict('build')
+        if _bld and 'mingw32' in _bld.get('compiler'):
             return True
-        if os.environ.get('MSYSTEM', '')=='MINGW32':
+        # parse setup.py command line: --compiler=mingw32 or -c mingw32
+        elif (_i for _i in sys.argv if 'mingw32' in _i) and \
+             (_i for _i in sys.argv if ('setup.py') in _i):
+            return True
+        # using msys or msys2 shell
+        elif os.environ.get('OSTYPE', '')=='msys':
+            return True
+        elif os.environ.get('MSYSTEM', '') in ('MINGW32', 'MINGW64'):
             return True
     return False