From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 29 Jul 2018 09:02:16 +0000 (-0700)
Subject: bpo-34225: Ensure INCLUDE and LIB directories do not end with a backslash. (GH-8464)
X-Git-Tag: v3.6.7rc1~144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f6a7e100d68fddc9fb98f5cbdf1981994360407;p=thirdparty%2FPython%2Fcpython.git

bpo-34225: Ensure INCLUDE and LIB directories do not end with a backslash. (GH-8464)

(cherry picked from commit 5473f061f518aef5367a535999a407305fb12aff)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
---

diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
index c9d3c6c67120..30b3b4739851 100644
--- a/Lib/distutils/_msvccompiler.py
+++ b/Lib/distutils/_msvccompiler.py
@@ -252,11 +252,11 @@ class MSVCCompiler(CCompiler) :
 
         for dir in vc_env.get('include', '').split(os.pathsep):
             if dir:
-                self.add_include_dir(dir)
+                self.add_include_dir(dir.rstrip(os.sep))
 
         for dir in vc_env.get('lib', '').split(os.pathsep):
             if dir:
-                self.add_library_dir(dir)
+                self.add_library_dir(dir.rstrip(os.sep))
 
         self.preprocess_options = None
         # If vcruntime_redist is available, link against it dynamically. Otherwise,
diff --git a/Misc/NEWS.d/next/Windows/2018-07-25-16-13-12.bpo-34225.ngemNL.rst b/Misc/NEWS.d/next/Windows/2018-07-25-16-13-12.bpo-34225.ngemNL.rst
new file mode 100644
index 000000000000..d29c8696307d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-07-25-16-13-12.bpo-34225.ngemNL.rst
@@ -0,0 +1 @@
+Ensure INCLUDE and LIB directories do not end with a backslash.