aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-08-14 07:35:13 +0000
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-08-14 07:35:13 +0000
commitdd8e87105079fbf52d866825dc56482a40732b99 (patch)
treed8bbeaab0f1a42d3880cd589e8bdc4122a7cf94f
parenta52ff5544a4ddb9aa9b5e94543f45cf7ad7f348e (diff)
downloadexternal_python_setuptools-dd8e87105079fbf52d866825dc56482a40732b99.tar.gz
external_python_setuptools-dd8e87105079fbf52d866825dc56482a40732b99.tar.bz2
external_python_setuptools-dd8e87105079fbf52d866825dc56482a40732b99.zip
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. ........
-rw-r--r--command/build_ext.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/command/build_ext.py b/command/build_ext.py
index 2db53f13..7ef5becc 100644
--- a/command/build_ext.py
+++ b/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