From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 14 Aug 2008 07:35:13 +0000 (+0000)
Subject: Merged revisions 65667 via svnmerge from
X-Git-Tag: v3.0b3~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95b1cf646a8a2a82ce7e45213361dd0506e42f72;p=python

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.
........
---

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 2db53f134d..7ef5becc6f 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