diff options
author | rku <rokups@zoho.com> | 2015-08-20 17:54:55 +0300 |
---|---|---|
committer | rku <rokups@zoho.com> | 2015-08-20 17:54:55 +0300 |
commit | 24ad2cb39247039c50db1b0a8633d00130814fda (patch) | |
tree | 73c821c1c4e1d5b8a80cccb7324fa77aca191cb2 /compiler/options.nim | |
parent | 6a7a44bbf248fad96ed0eed115e3b3c77a77bf89 (diff) | |
parent | 69b32637b1f12000b64fa4db452323dc30b3567f (diff) | |
download | Nim-24ad2cb39247039c50db1b0a8633d00130814fda.tar.gz |
Merge branch 'devel' into coroutines
Diffstat (limited to 'compiler/options.nim')
-rw-r--r-- | compiler/options.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/options.nim b/compiler/options.nim index af1e21e60..adf2017d6 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -210,7 +210,7 @@ proc removeTrailingDirSep*(path: string): string = else: result = path -proc getGeneratedPath: string = +proc getNimcacheDir*: string = result = if nimcacheDir.len > 0: nimcacheDir else: gProjectPath.shortenDir / genSubDir @@ -266,7 +266,7 @@ proc toGeneratedFile*(path, ext: string): string = ## converts "/home/a/mymodule.nim", "rod" to "/home/a/nimcache/mymodule.rod" var (head, tail) = splitPath(path) #if len(head) > 0: head = shortenDir(head & dirSep) - result = joinPath([getGeneratedPath(), changeFileExt(tail, ext)]) + result = joinPath([getNimcacheDir(), changeFileExt(tail, ext)]) #echo "toGeneratedFile(", path, ", ", ext, ") = ", result when noTimeMachine: @@ -294,7 +294,7 @@ when noTimeMachine: proc completeGeneratedFilePath*(f: string, createSubDir: bool = true): string = var (head, tail) = splitPath(f) #if len(head) > 0: head = removeTrailingDirSep(shortenDir(head & dirSep)) - var subdir = getGeneratedPath() # / head + var subdir = getNimcacheDir() # / head if createSubDir: try: createDir(subdir) |