diff options
| author | J. Goutin <JGoutin@users.noreply.github.com> | 2016-08-05 17:44:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 17:44:26 +0200 |
| commit | a5791ac002d9d00759b63727f9c930a2acba7d9f (patch) | |
| tree | 8a10b9eab4ad578e3813e8ed137963e05304ceff /setuptools/msvc.py | |
| parent | 409e1383315ef3f5f2f074b5d95a0bd9c2d66cdf (diff) | |
| download | external_python_setuptools-a5791ac002d9d00759b63727f9c930a2acba7d9f.tar.gz external_python_setuptools-a5791ac002d9d00759b63727f9c930a2acba7d9f.tar.bz2 external_python_setuptools-a5791ac002d9d00759b63727f9c930a2acba7d9f.zip | |
revert `library_dir_option` patch.
Revert patch on `distutils._msvccompiler.MSVCCompiler.library_dir_option`
See comments on #694.
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 97dd441c..4616d4be 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -85,13 +85,6 @@ def patch_for_specialized_compiler(): except Exception: pass - try: - # Patch distutils._msvccompiler.MSVCCompiler.library_dir_option - unpatched['msvc14_library_dir_option'] = msvc14compiler.MSVCCompiler.library_dir_option - msvc14compiler.MSVCCompiler.library_dir_option = msvc14_library_dir_option - except Exception: - pass - def msvc9_find_vcvarsall(version): """ @@ -219,27 +212,6 @@ def msvc14_get_vc_env(plat_spec): raise -def msvc14_library_dir_option(self, dir): - """ - Patched "distutils._msvccompiler.MSVCCompiler.library_dir_option" - to fix unquoted path in "\LIBPATH" argument when a space is on path. - - Parameters - ---------- - dir: str - Path to convert in "\LIBPATH" argument. - - Return - ------ - "\LIBPATH" argument: str - """ - opt = unpatched['msvc14_library_dir_option'](self, dir) - if ' ' in opt and '"' not in opt: - # Quote if space and not already quoted - opt = '"%s"' % opt - return opt - - def _augment_exception(exc, version, arch=''): """ Add details to the exception message to help guide the user |