diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-10 13:29:06 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-10 13:29:06 -0400 |
| commit | 88f283d8caefc36a1699a73aae12fd416b6c8090 (patch) | |
| tree | bef081c1cb027d4bd3bb81b4e4448cff9bf61e79 | |
| parent | fe0cb80d225508813de21e048c2f1529c2dc6a75 (diff) | |
| parent | f5dff9fe51b3bf07ba9b66e550f3cabc2fc3937b (diff) | |
| download | numpy-88f283d8caefc36a1699a73aae12fd416b6c8090.tar.gz | |
Merge pull request #6187 from charris/fix-busted-mingw-build
BLD: Option /GL does not exist for mingw32 compiler.
| -rw-r--r-- | numpy/core/setup_common.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 3afe40f28..253dad5b6 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -6,6 +6,8 @@ import warnings import copy import binascii +from numpy.distutils.misc_util import mingw32 + #------------------- # Versioning support @@ -184,7 +186,7 @@ def check_long_double_representation(cmd): # Disable whole program optimization (the default on vs2015, with python 3.5+) # which generates intermediary object files and prevents checking the # float representation. - if sys.platform == "win32": + if sys.platform == "win32" and not mingw32(): try: cmd.compiler.compile_options.remove("/GL") except ValueError: |