diff options
| author | Daniil Yarancev <21169548+Yardanico@users.noreply.github.com> | 2018-06-05 21:25:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 21:25:45 +0300 |
| commit | 642641359821b6a63c6cf7edaaa45873b7ea59c7 (patch) | |
| tree | 627af3020528cb916b3174bd94304307ca875c77 /compiler/gorgeimpl.nim | |
| parent | fb44c522e6173528efa8035ecc459c84887d0167 (diff) | |
| parent | 3cbc07ac7877b03c605498760fe198e3200cc197 (diff) | |
| download | Nim-642641359821b6a63c6cf7edaaa45873b7ea59c7.tar.gz | |
Merge pull request #2 from nim-lang/devel
Update
Diffstat (limited to 'compiler/gorgeimpl.nim')
| -rw-r--r-- | compiler/gorgeimpl.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/gorgeimpl.nim b/compiler/gorgeimpl.nim index 2c51752cd..44c7651bc 100644 --- a/compiler/gorgeimpl.nim +++ b/compiler/gorgeimpl.nim @@ -9,7 +9,7 @@ ## Module that implements ``gorge`` for the compiler. -import msgs, securehash, os, osproc, streams, strutils, options +import msgs, std / sha1, os, osproc, streams, strutils, options proc readOutput(p: Process): (string, int) = result[0] = "" @@ -21,11 +21,11 @@ proc readOutput(p: Process): (string, int) = result[0].setLen(result[0].len - "\n".len) result[1] = p.waitForExit -proc opGorge*(cmd, input, cache: string, info: TLineInfo): (string, int) = +proc opGorge*(cmd, input, cache: string, info: TLineInfo; conf: ConfigRef): (string, int) = 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") + let filename = options.toGeneratedFile(conf, "gorge_" & $h, "txt") var f: File if open(f, filename): result = (f.readAll, 0) |