Skip to content

Commit

Permalink
Merge pull request #90626 from Repiteo/scons/msvc-sucks-eggs
Browse files Browse the repository at this point in the history
SCons: Fix `silence_msvc` regression
  • Loading branch information
akien-mga committed Apr 13, 2024
2 parents b2b51e1 + 6df57d2 commit 43b32f9
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions platform/windows/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,13 @@ def spawn_capture(sh, escape, cmd, args, env):
ret = old_spawn(sh, escape, cmd, args, env)

try:
with open(tmp_stdout_name, "rt", encoding=sys.stdout.encoding) as tmp_stdout:
# First line is always bloat, subsequent lines are always errors. This filter sends
# either just the errors to stderr, or an empty string to effectively do nothing.
sys.stderr.write("".join(tmp_stdout.readlines()[1:]))
with open(tmp_stdout_name, "rb") as tmp_stdout:
# First line is always bloat, subsequent lines are always errors. If content
# exists after discarding the first line, safely decode & send to stderr.
tmp_stdout.readline()
content = tmp_stdout.read()
if content:
sys.stderr.write(content.decode(sys.stdout.encoding, "replace"))
os.remove(tmp_stdout_name)
except OSError:
pass
Expand Down

0 comments on commit 43b32f9

Please sign in to comment.