summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-12-15 21:15:25 +0000
committerÉric Araujo <merwok@netwok.org>2010-12-15 21:15:25 +0000
commite04c13cfc14f7c1bbfe9052af18e36c2ef67f1d8 (patch)
tree24d52db36c0d41fb78726b9a33783987dd98c2f0
parent6e52cf32adad272fafc97a95f54c9116ace0a063 (diff)
downloadcpython-git-e04c13cfc14f7c1bbfe9052af18e36c2ef67f1d8.tar.gz
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). ........
-rw-r--r--Lib/distutils/command/build_ext.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 5b3be6fbd6..55a4288ac0 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -207,7 +207,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 780d6b1da4..fae9ccc50a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,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.