diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-08-05 09:38:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 09:38:41 -0400 |
| commit | 740e96f6d99986d9869264c42bdf3f0ec46aa3ed (patch) | |
| tree | 5b0d81d8d70cf1e84e607fe1e263d9241bb38f91 | |
| parent | ca35cb9ef3d78a24e8c9f34bec84bfa42706411f (diff) | |
| parent | e3805614a5ed770d3ba86acd339a24947c19a65b (diff) | |
| download | python-setuptools-git-740e96f6d99986d9869264c42bdf3f0ec46aa3ed.tar.gz | |
Merge pull request #723 from minrk/quote-after-calling
quote library_dir_option after calling unpatched version
| -rw-r--r-- | setuptools/msvc.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 2700a2b0..97dd441c 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -233,10 +233,11 @@ def msvc14_library_dir_option(self, dir): ------ "\LIBPATH" argument: str """ - if ' ' in dir and '"' not in dir: + opt = unpatched['msvc14_library_dir_option'](self, dir) + if ' ' in opt and '"' not in opt: # Quote if space and not already quoted - dir = '"%s"' % dir - return unpatched['msvc14_library_dir_option'](self, dir) + opt = '"%s"' % opt + return opt def _augment_exception(exc, version, arch=''): |