[Python-3000-checkins] r65670 - in python/branches/py3k: Lib/distutils/command/build_ext.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Thu Aug 14 09:35:13 2008
New Revision: 65670

Log:
Merged revisions 65667 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r65667 | hirokazu.yamamoto | 2008-08-14 14:50:43 +0900 | 1 line

Fixed test_distutils error (test_build_ext) on VC6.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/command/build_ext.py

Modified: python/branches/py3k/Lib/distutils/command/build_ext.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/build_ext.py (original)
+++ python/branches/py3k/Lib/distutils/command/build_ext.py Thu Aug 14 09:35:13 2008
@@ -205,9 +205,12 @@
elif MSVC_VERSION == 8:
self.library_dirs.append(os.path.join(sys.exec_prefix,
'PC', 'VS8.0', 'win32release'))
- else:
+ elif MSVC_VERSION == 7:
self.library_dirs.append(os.path.join(sys.exec_prefix,
'PC', 'VS7.1'))
+ else:
+ self.library_dirs.append(os.path.join(sys.exec_prefix,
+ 'PC', 'VC6'))

# OS/2 (EMX) doesn't support Debug vs Release builds, but has the
# import libraries in its "Config" subdirectory