Merge pull request #723 from minrk/quote-after-calling

quote library_dir_option after calling unpatched version
pypa · Aug 5, 2016 · 740e96f · 740e96f
2 parents ca35cb9 + e380561
commit 740e96f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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=''):