summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-08-14 07:35:13 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-08-14 07:35:13 (GMT)
commit95b1cf646a8a2a82ce7e45213361dd0506e42f72 (patch)
tree50bc0ac945afe09b7320f084f548e3e049daa23d /Lib/distutils/command
parent3a954da1a7fccff4c8305420e57e51267b002bea (diff)
downloadcpython-95b1cf646a8a2a82ce7e45213361dd0506e42f72.zip
cpython-95b1cf646a8a2a82ce7e45213361dd0506e42f72.tar.gz
cpython-95b1cf646a8a2a82ce7e45213361dd0506e42f72.tar.bz2
Merged revisions 65667 via svnmerge from
svn+ssh://pythondev@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. ........
Diffstat (limited to 'Lib/distutils/command')
-rw-r--r--Lib/distutils/command/build_ext.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 2db53f1..7ef5bec 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -205,9 +205,12 @@ class build_ext(Command):
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