From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 3 Aug 2004 12:41:42 +0000 (+0000)
Subject: Patch #870382: Automatically add msvcr71 to the list of libraries if
X-Git-Tag: v2.4a2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7db57b3b419897d93ca2fa75a0cb0a03c25916fd;p=python

Patch #870382: Automatically add msvcr71 to the list of libraries if
Python was built with VC 7.1.
---

diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
index a962007601..acd393d593 100644
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -122,6 +122,17 @@ class CygwinCCompiler (UnixCCompiler):
                 "Consider upgrading to a newer version of gcc")
         else:
             self.dll_libraries=[]
+	    # Include the appropriate MSVC runtime library if Python was built
+	    # with MSVC 7.0 or 7.1.
+	    msc_pos = sys.version.find('MSC v.')
+	    if msc_pos != -1:
+		msc_ver = sys.version[msc_pos+6:msc_pos+10]
+		if msc_ver == '1300':
+		    # MSVC 7.0
+		    self.dll_libraries = ['msvcr70']
+		elif msc_ver == '1310':
+		    # MSVC 7.1
+		    self.dll_libraries = ['msvcr71']
 
     # __init__ ()
 
@@ -308,6 +319,18 @@ class Mingw32CCompiler (CygwinCCompiler):
         # no additional libraries needed
         self.dll_libraries=[]
 
+	# Include the appropriate MSVC runtime library if Python was built
+	# with MSVC 7.0 or 7.1.
+	msc_pos = sys.version.find('MSC v.')
+	if msc_pos != -1:
+	    msc_ver = sys.version[msc_pos+6:msc_pos+10]
+	    if msc_ver == '1300':
+		# MSVC 7.0
+		self.dll_libraries = ['msvcr70']
+	    elif msc_ver == '1310':
+		# MSVC 7.1
+		self.dll_libraries = ['msvcr71']
+
     # __init__ ()
 
 # class Mingw32CCompiler