Skip to content

Commit 1ce6423

Browse files
committed
Merge branch 'main' into multidim_safearray
2 parents d409a28 + f2d1af2 commit 1ce6423

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

setup.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import os
3131
import platform
3232
import re
33-
import shutil
3433
import sys
3534
import winreg
3635
from collections.abc import MutableSequence
@@ -910,30 +909,13 @@ def key_reverse_mc(a):
910909

911910
def spawn(self, cmd: MutableSequence[str]) -> None: # type: ignore[override] # More restrictive than supertype
912911
is_link = cmd[0].endswith("link.exe") or cmd[0].endswith('"link.exe"')
913-
is_mt = cmd[0].endswith("mt.exe") or cmd[0].endswith('"mt.exe"')
914-
if is_mt:
915-
# We don't want mt.exe run...
916-
return
917912
if is_link:
918913
# remove /MANIFESTFILE:... and add MANIFEST:NO
919914
for i in range(len(cmd)):
920915
if cmd[i].startswith(("/MANIFESTFILE:", "/MANIFEST:EMBED")):
921916
cmd[i] = "/MANIFEST:NO"
922917
break
923-
if is_mt:
924-
# We want mt.exe run with the original manifest
925-
for i in range(len(cmd)):
926-
if cmd[i] == "-manifest":
927-
cmd[i + 1] += ".orig"
928-
break
929918
super().spawn(cmd) # type: ignore[arg-type] # mypy variance issue, but pyright ok
930-
if is_link:
931-
# We want a copy of the original manifest so we can use it later.
932-
for i in range(len(cmd)):
933-
if cmd[i].startswith("/MANIFESTFILE:"):
934-
mfname = cmd[i][14:]
935-
shutil.copyfile(mfname, mfname + ".orig")
936-
break
937919

938920
# CCompiler's implementations of these methods completely replace the values
939921
# determined by the build environment. This seems like a design that must

0 commit comments

Comments
 (0)