From: Éric Araujo <merwok@netwok.org>
Date: Wed, 15 Dec 2010 21:12:12 +0000 (+0000)
Subject: Merged revisions 87280 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d899dddb205f7e2d24e5d1737950b304c965721;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 87280 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87280 | eric.araujo | 2010-12-15 22:07:22 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix build_ext with VS 8.0.  Patch by Hirokazu Yamamoto (#9558).
........
---

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 4e664642b82e..502b39a82f7f 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -214,7 +214,7 @@ class build_ext(Command):
 
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VS8.0', 'win32release'))
+                                         'PC', 'VS8.0'))
             elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))
diff --git a/Misc/NEWS b/Misc/NEWS
index cd670e7850fb..d8fd483abba3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #9558: Fix distutils.command.build_ext with VS 8.0.
+
 - Issue #10695: passing the port as a string value to telnetlib no longer
   causes debug mode to fail.