diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-09 11:24:34 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-09 11:24:34 -0400 |
| commit | 602dc92bd696ad292b4ab44638a01d0035d560ab (patch) | |
| tree | 63b191e187314e1569861edf7f01e6222381c61b /setuptools/monkey.py | |
| parent | a343901877cfe4fa922c40076f3c16aa59d4b265 (diff) | |
| download | external_python_setuptools-602dc92bd696ad292b4ab44638a01d0035d560ab.tar.gz external_python_setuptools-602dc92bd696ad292b4ab44638a01d0035d560ab.tar.bz2 external_python_setuptools-602dc92bd696ad292b4ab44638a01d0035d560ab.zip | |
Fix msvc monkeypatching, revealed by Appveyor tests. Fixes #778.
Diffstat (limited to 'setuptools/monkey.py')
| -rw-r--r-- | setuptools/monkey.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/setuptools/monkey.py b/setuptools/monkey.py index 5a0cf43b..63891e74 100644 --- a/setuptools/monkey.py +++ b/setuptools/monkey.py @@ -7,6 +7,7 @@ import distutils.filelist import platform import setuptools +from . import msvc __all__ = [] @@ -134,22 +135,22 @@ def patch_for_msvc_specialized_compiler(): try: # Patch distutils.msvc9compiler unpatched['msvc9_find_vcvarsall'] = msvc9compiler.find_vcvarsall - msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall + msvc9compiler.find_vcvarsall = msvc.msvc9_find_vcvarsall unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall - msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall + msvc9compiler.query_vcvarsall = msvc.msvc9_query_vcvarsall except NameError: pass try: # Patch distutils._msvccompiler._get_vc_env unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env - msvc14compiler._get_vc_env = msvc14_get_vc_env + msvc14compiler._get_vc_env = msvc.msvc14_get_vc_env except NameError: pass try: # Patch distutils._msvccompiler.gen_lib_options for Numpy unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options - msvc14compiler.gen_lib_options = msvc14_gen_lib_options + msvc14compiler.gen_lib_options = msvc.msvc14_gen_lib_options except NameError: pass |