mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Issue #4120: Drop reference to CRT from manifest when building
extensions with msvc9compiler.
This commit is contained in:
parent
3dc254181a
commit
c218a2fac8
2 changed files with 26 additions and 0 deletions
|
@ -17,6 +17,7 @@ __revision__ = "$Id$"
|
|||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import re
|
||||
|
||||
from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
|
||||
CompileError, LibError, LinkError
|
||||
|
@ -646,6 +647,28 @@ class MSVCCompiler(CCompiler) :
|
|||
mfid = 1
|
||||
else:
|
||||
mfid = 2
|
||||
try:
|
||||
# Remove references to the Visual C runtime, so they will
|
||||
# fall through to the Visual C dependency of Python.exe.
|
||||
# This way, when installed for a restricted user (e.g.
|
||||
# runtimes are not in WinSxS folder, but in Python's own
|
||||
# folder), the runtimes do not need to be in every folder
|
||||
# with .pyd's.
|
||||
manifest_f = open(temp_manifest, "rb")
|
||||
manifest_buf = manifest_f.read()
|
||||
manifest_f.close()
|
||||
pattern = re.compile(
|
||||
r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
|
||||
r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
|
||||
re.DOTALL)
|
||||
manifest_buf = re.sub(pattern, "", manifest_buf)
|
||||
pattern = "<dependentAssembly>\s*</dependentAssembly>"
|
||||
manifest_buf = re.sub(pattern, "", manifest_buf)
|
||||
manifest_f = open(temp_manifest, "wb")
|
||||
manifest_f.write(manifest_buf)
|
||||
manifest_f.close()
|
||||
except IOError:
|
||||
pass
|
||||
out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
|
||||
try:
|
||||
self.spawn(['mt.exe', '-nologo', '-manifest',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue