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

Merge pull request #4872 from flyx/gorgefix

Browse source 
Fixes #4871
This commit is contained in:
Andreas Rumpf 2016-10-24 17:40:32 +02:00 • committed by GitHub
commit cceb6c625c
5 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/vmdeps.nim
View file

@ -19,7 +19,8 @@ proc readOutput(p: Process): string =
result.setLen(result.len - "\n".len)
discard p.waitForExit
proc opGorge*(cmd, input, cache: string): string =
proc opGorge*(cmd, input, cache: string, info: TLineInfo): string =
let workingDir = parentDir(info.toFullPath)
if cache.len > 0:# and optForceFullMake notin gGlobalOptions:
let h = secureHash(cmd & "\t" & input & "\t" & cache)
let filename = options.toGeneratedFile("gorge_" & $h, "txt")
@ -30,7 +31,8 @@ proc opGorge*(cmd, input, cache: string): string =
return
var readSuccessful = false
try:
var p = startProcess(cmd, options={poEvalCommand, poStderrToStdout})
var p = startProcess(cmd, workingDir,
options={poEvalCommand, poStderrToStdout})
if input.len != 0:
p.inputStream.write(input)
p.inputStream.close()
@ -41,7 +43,8 @@ proc opGorge*(cmd, input, cache: string): string =
if not readSuccessful: result = ""
else:
try:
var p = startProcess(cmd, options={poEvalCommand, poStderrToStdout})
var p = startProcess(cmd, workingDir,
options={poEvalCommand, poStderrToStdout})
if input.len != 0:
p.inputStream.write(input)
p.inputStream.close()