diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-05-22 07:33:49 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-05-22 07:33:49 -0700 |
| commit | 339e90176f06e0a8d6e677f461a490de63001771 (patch) | |
| tree | 776aace58e69216b584537cc573b3adb33c1ef66 | |
| parent | 9f02103ac229d5831b07c75eb1a3f36fedc416c8 (diff) | |
| parent | dea0fe58708b548925778ec30fdc6e7a4cb5bbf4 (diff) | |
| download | numpy-339e90176f06e0a8d6e677f461a490de63001771.tar.gz | |
Merge pull request #3344 from cgohlke/patch-1
Remove the msvc_on_amd64 function
| -rw-r--r-- | numpy/distutils/ccompiler.py | 5 | ||||
| -rw-r--r-- | numpy/distutils/misc_util.py | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index 51a349aea..48f6f09b6 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -16,7 +16,7 @@ from distutils.version import LooseVersion from numpy.distutils import log from numpy.distutils.exec_command import exec_command from numpy.distutils.misc_util import cyg2win32, is_sequence, mingw32, \ - quote_args, msvc_on_amd64 + quote_args from numpy.distutils.compat import get_exception @@ -654,6 +654,3 @@ def split_quoted(s): return words ccompiler.split_quoted = split_quoted ##Fix distutils.util.split_quoted: - -# define DISTUTILS_USE_SDK when necessary to workaround distutils/msvccompiler.py bug -msvc_on_amd64() diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 38690aec3..bc073aee4 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -367,17 +367,6 @@ def msvc_runtime_library(): lib = None return lib -def msvc_on_amd64(): - if not (sys.platform=='win32' or os.name=='nt'): - return - if get_build_architecture() != 'AMD64': - return - if 'DISTUTILS_USE_SDK' in os.environ: - return - # try to avoid _MSVCCompiler__root attribute error - print('Forcing DISTUTILS_USE_SDK=1') - os.environ['DISTUTILS_USE_SDK']='1' - return ######################### |