Commit f5802f36 authored by J. Goutin's avatar J. Goutin Committed by GitHub

Improve numpy.distutils detection

Agree with @pitrou comment.
parent 38d67434
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
This module adds improved support for Microsoft Visual C++ compilers. This module adds improved support for Microsoft Visual C++ compilers.
""" """
import os import os
import sys
import platform import platform
import itertools import itertools
import distutils.errors import distutils.errors
...@@ -225,7 +226,7 @@ def msvc14_gen_lib_options(*args, **kwargs): ...@@ -225,7 +226,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
compatibility between "numpy.distutils" and "distutils._msvccompiler" compatibility between "numpy.distutils" and "distutils._msvccompiler"
(for Numpy < 1.11.2) (for Numpy < 1.11.2)
""" """
if "numpy" in distutils.ccompiler.CCompiler.spawn.__module__: if "numpy.distutils" in sys.modules:
import numpy as np import numpy as np
return np.distutils.ccompiler.gen_lib_options(*args, **kwargs) return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment