Patch #1075887: Don't require MSVC in distutils if there is nothing

to build. Will backport to 2.4

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 89a75b3486333ba8bd2a2f7ccc40a5fe485a5c74..016139321c30230d3e893ff6bec74715ac5e557b 100644 (file)
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -211,6 +211,9 @@ class MSVCCompiler (CCompiler) :
             self.__macros = MacroExpander(self.__version)
         else:
             self.__root = r"Software\Microsoft\Devstudio"
+        self.initialized = False
+
+    def initialize(self):
         self.__paths = self.get_msvc_paths("path")
 
         if len (self.__paths) == 0:
@@ -290,6 +293,7 @@ class MSVCCompiler (CCompiler) :
                 output_dir=None, macros=None, include_dirs=None, debug=0,
                 extra_preargs=None, extra_postargs=None, depends=None):
 
+       if not self.initialized: self.initialize()
         macros, objects, extra_postargs, pp_opts, build = \
                 self._setup_compile(output_dir, macros, include_dirs, sources,
                                     depends, extra_postargs)
@@ -381,6 +385,7 @@ class MSVCCompiler (CCompiler) :
                            debug=0,
                            target_lang=None):
 
+       if not self.initialized: self.initialize()
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
@@ -414,6 +419,7 @@ class MSVCCompiler (CCompiler) :
               build_temp=None,
               target_lang=None):
 
+       if not self.initialized: self.initialize()
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)

diff --git a/Misc/NEWS b/Misc/NEWS
index d5511eb217f624df89661f015022b857f8ad2902..93ca629d5db293cbc04acc508c8ab48535104d49 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Extension Modules
 Library
 -------
 
+- Patch #1075887: Don't require MSVC in distutils if there is nothing
+  to build.
+
 - Patch #1103407: Properly deal with tarfile iterators when untarring
   symbolic links on Windows.