summaryrefslogtreecommitdiff
path: root/numpy/core/setup_common.py
diff options
context:
space:
mode:
authorMatthew Brett <matthew.brett@gmail.com>2015-09-21 10:22:25 -0700
committerMatthew Brett <matthew.brett@gmail.com>2015-09-21 10:22:25 -0700
commitedb902cdc6573553afcf11047ecdfb447e444322 (patch)
tree652aa01ac7a621b2b95f3307aefca6890ca62fb7 /numpy/core/setup_common.py
parent3a2f05582ecd87d8aa599e435330f459e6a4d3ea (diff)
parent7f96e9d7ab678b636761313e22d03e73bb929520 (diff)
downloadnumpy-1.9.3.tar.gz
Merge pull request #6332 from matthew-brett/prepare-1.9.3v1.9.3
MRG: preparations for 1.9.3 release Backport of 7d6aa8c - gzip fix for Python 3.5 Backport of b08f369 - numpy.distutils patch to help homebrew Backport of various fixes for Windows builds on modern MSVC.
Diffstat (limited to 'numpy/core/setup_common.py')
-rw-r--r--numpy/core/setup_common.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index be5673a47..81eec041b 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -171,6 +171,15 @@ def check_long_double_representation(cmd):
cmd._check_compiler()
body = LONG_DOUBLE_REPRESENTATION_SRC % {'type': 'long double'}
+ # 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":
+ try:
+ cmd.compiler.compile_options.remove("/GL")
+ except ValueError:
+ pass
+
# We need to use _compile because we need the object filename
src, object = cmd._compile(body, None, None, 'c')
try: