jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #8648 - use parent streams to avoid hang (#13445)

Browse source
This commit is contained in:
genotrance 2020-02-20 16:04:48 -06:00 • committed by GitHub
commit 7a2b623d2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/extccomp.nim
View file

@ -555,7 +555,7 @@ proc getCompileOptions(conf: ConfigRef): string =
proc vccplatform(conf: ConfigRef): string = proc vccplatform(conf: ConfigRef): string =
# VCC specific but preferable over the config hacks people # VCC specific but preferable over the config hacks people
# had to do before, see #11306 # had to do before, see #11306
if conf.cCompiler == ccVcc: if conf.cCompiler == ccVcc:
let exe = getConfigVar(conf, conf.cCompiler, ".exe") let exe = getConfigVar(conf, conf.cCompiler, ".exe")
if "vccexe.exe" == extractFilename(exe): if "vccexe.exe" == extractFilename(exe):
result = case conf.target.targetCPU result = case conf.target.targetCPU
@ -845,8 +845,7 @@ proc execCmdsInParallel(conf: ConfigRef; cmds: seq[string]; prettyCb: proc (idx:
let exitCode = p.peekExitCode let exitCode = p.peekExitCode
if exitCode != 0: if exitCode != 0:
rawMessage(conf, errGenerated, "execution of an external compiler program '" & rawMessage(conf, errGenerated, "execution of an external compiler program '" &
cmds[idx] & "' failed with exit code: " & $exitCode & "\n\n" & cmds[idx] & "' failed with exit code: " & $exitCode & "\n\n")
p.outputStream.readAll.strip)
if conf.numberOfProcessors == 0: conf.numberOfProcessors = countProcessors() if conf.numberOfProcessors == 0: conf.numberOfProcessors = countProcessors()
var res = 0 var res = 0
if conf.numberOfProcessors <= 1: if conf.numberOfProcessors <= 1:
@ -859,13 +858,13 @@ proc execCmdsInParallel(conf: ConfigRef; cmds: seq[string]; prettyCb: proc (idx:
else: else:
tryExceptOSErrorMessage(conf, "invocation of external compiler program failed."): tryExceptOSErrorMessage(conf, "invocation of external compiler program failed."):
if optListCmd in conf.globalOptions or conf.verbosity > 1: if optListCmd in conf.globalOptions or conf.verbosity > 1:
res = execProcesses(cmds, {poEchoCmd, poStdErrToStdOut, poUsePath}, res = execProcesses(cmds, {poEchoCmd, poStdErrToStdOut, poUsePath, poParentStreams},
conf.numberOfProcessors, afterRunEvent=runCb) conf.numberOfProcessors, afterRunEvent=runCb)
elif conf.verbosity == 1: elif conf.verbosity == 1:
res = execProcesses(cmds, {poStdErrToStdOut, poUsePath}, res = execProcesses(cmds, {poStdErrToStdOut, poUsePath, poParentStreams},
conf.numberOfProcessors, prettyCb, afterRunEvent=runCb) conf.numberOfProcessors, prettyCb, afterRunEvent=runCb)
else: else:
res = execProcesses(cmds, {poStdErrToStdOut, poUsePath}, res = execProcesses(cmds, {poStdErrToStdOut, poUsePath, poParentStreams},
conf.numberOfProcessors, afterRunEvent=runCb) conf.numberOfProcessors, afterRunEvent=runCb)
if res != 0: if res != 0:
if conf.numberOfProcessors <= 1: if conf.numberOfProcessors <= 1: