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

fixes the new nimcache handling

Browse source
This commit is contained in:
Araq 2018-08-07 22:54:45 +02:00
commit dd75346292
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/options.nim
View file

@ -487,11 +487,12 @@ proc getOsCacheDir(): string =
result = getHomeDir() / genSubDir result = getHomeDir() / genSubDir
proc getNimcacheDir*(conf: ConfigRef): string = proc getNimcacheDir*(conf: ConfigRef): string =
# XXX projectName should always be without a file extension!
result = if conf.nimcacheDir.len > 0: result = if conf.nimcacheDir.len > 0:
conf.nimcacheDir conf.nimcacheDir
elif conf.cmd == cmdCompileToJS: elif conf.cmd == cmdCompileToJS:
shortenDir(conf, conf.projectPath) / genSubDir shortenDir(conf, conf.projectPath) / genSubDir
else: getOsCacheDir() / conf.projectName & else: getOsCacheDir() / splitFile(conf.projectName).name &
(if isDefined(conf, "release"): "_r" else: "_d") (if isDefined(conf, "release"): "_r" else: "_d")
proc pathSubs*(conf: ConfigRef; p, config: string): string = proc pathSubs*(conf: ConfigRef; p, config: string): string =