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

fixes bootstrapping problems

Browse source
This commit is contained in:
Araq 2018-09-07 14:07:42 +02:00
commit 7a8c575924
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/jsgen.nim
View file

@ -2254,7 +2254,7 @@ proc genClass(conf: ConfigRef; obj: PType; content: Rope; ext: string) =
"class $#$# {$n$#$n}$n") % "class $#$# {$n$#$n}$n") %
[rope(VersionAsString), cls, extends, content] [rope(VersionAsString), cls, extends, content]
let outfile = changeFileExt(completeCFilePath(conf, AbsoluteFile $cls), ext) let outfile = changeFileExt(completeCFilePath(conf, AbsoluteFile($cls)), ext)
discard writeRopeIfNotEqual(result, outfile) discard writeRopeIfNotEqual(result, outfile)
proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode = proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode =

2
compiler/nim.nim
View file

@ -36,7 +36,7 @@ proc prependCurDir(f: AbsoluteFile): AbsoluteFile =
if os.isAbsolute(f.string): result = f if os.isAbsolute(f.string): result = f
else: result = AbsoluteFile("./" & f.string) else: result = AbsoluteFile("./" & f.string)
else: else:
result = AbsoluteFile f result = f
proc processCmdLine(pass: TCmdLinePass, cmd: string; config: ConfigRef) = proc processCmdLine(pass: TCmdLinePass, cmd: string; config: ConfigRef) =
var p = parseopt.initOptParser(cmd) var p = parseopt.initOptParser(cmd)

2
compiler/options.nim
View file

@ -514,7 +514,7 @@ proc getOsCacheDir(): string =
when defined(posix): when defined(posix):
result = getEnv("XDG_CACHE_HOME", getHomeDir() / ".cache") / "nim" result = getEnv("XDG_CACHE_HOME", getHomeDir() / ".cache") / "nim"
else: else:
result = getHomeDir() / genSubDir result = getHomeDir() / genSubDir.string
proc getNimcacheDir*(conf: ConfigRef): AbsoluteDir = proc getNimcacheDir*(conf: ConfigRef): AbsoluteDir =
# XXX projectName should always be without a file extension! # XXX projectName should always be without a file extension!