mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
Patch #1075887: Don't require MSVC in distutils if there is nothing
to build. Will backport to 2.4
This commit is contained in:
parent
637431bf14
commit
c72dd38f30
2 changed files with 9 additions and 0 deletions
|
@ -211,6 +211,9 @@ class MSVCCompiler (CCompiler) :
|
||||||
self.__macros = MacroExpander(self.__version)
|
self.__macros = MacroExpander(self.__version)
|
||||||
else:
|
else:
|
||||||
self.__root = r"Software\Microsoft\Devstudio"
|
self.__root = r"Software\Microsoft\Devstudio"
|
||||||
|
self.initialized = False
|
||||||
|
|
||||||
|
def initialize(self):
|
||||||
self.__paths = self.get_msvc_paths("path")
|
self.__paths = self.get_msvc_paths("path")
|
||||||
|
|
||||||
if len (self.__paths) == 0:
|
if len (self.__paths) == 0:
|
||||||
|
@ -290,6 +293,7 @@ class MSVCCompiler (CCompiler) :
|
||||||
output_dir=None, macros=None, include_dirs=None, debug=0,
|
output_dir=None, macros=None, include_dirs=None, debug=0,
|
||||||
extra_preargs=None, extra_postargs=None, depends=None):
|
extra_preargs=None, extra_postargs=None, depends=None):
|
||||||
|
|
||||||
|
if not self.initialized: self.initialize()
|
||||||
macros, objects, extra_postargs, pp_opts, build = \
|
macros, objects, extra_postargs, pp_opts, build = \
|
||||||
self._setup_compile(output_dir, macros, include_dirs, sources,
|
self._setup_compile(output_dir, macros, include_dirs, sources,
|
||||||
depends, extra_postargs)
|
depends, extra_postargs)
|
||||||
|
@ -381,6 +385,7 @@ class MSVCCompiler (CCompiler) :
|
||||||
debug=0,
|
debug=0,
|
||||||
target_lang=None):
|
target_lang=None):
|
||||||
|
|
||||||
|
if not self.initialized: self.initialize()
|
||||||
(objects, output_dir) = self._fix_object_args (objects, output_dir)
|
(objects, output_dir) = self._fix_object_args (objects, output_dir)
|
||||||
output_filename = \
|
output_filename = \
|
||||||
self.library_filename (output_libname, output_dir=output_dir)
|
self.library_filename (output_libname, output_dir=output_dir)
|
||||||
|
@ -414,6 +419,7 @@ class MSVCCompiler (CCompiler) :
|
||||||
build_temp=None,
|
build_temp=None,
|
||||||
target_lang=None):
|
target_lang=None):
|
||||||
|
|
||||||
|
if not self.initialized: self.initialize()
|
||||||
(objects, output_dir) = self._fix_object_args (objects, output_dir)
|
(objects, output_dir) = self._fix_object_args (objects, output_dir)
|
||||||
(libraries, library_dirs, runtime_library_dirs) = \
|
(libraries, library_dirs, runtime_library_dirs) = \
|
||||||
self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
|
self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
|
||||||
|
|
|
@ -72,6 +72,9 @@ Extension Modules
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Patch #1075887: Don't require MSVC in distutils if there is nothing
|
||||||
|
to build.
|
||||||
|
|
||||||
- Patch #1103407: Properly deal with tarfile iterators when untarring
|
- Patch #1103407: Properly deal with tarfile iterators when untarring
|
||||||
symbolic links on Windows.
|
symbolic links on Windows.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue