From e06a89e11234e8882a4021d8d7cad0883c431f86 Mon Sep 17 00:00:00 2001 From: Araq Date: Fri, 7 Sep 2018 14:07:42 +0200 Subject: fixes bootstrapping problems --- compiler/jsgen.nim | 2 +- compiler/nim.nim | 2 +- compiler/options.nim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index be3b02388..1878081fd 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -2265,7 +2265,7 @@ proc genClass(conf: ConfigRef; obj: PType; content: Rope; ext: string) = "class $#$# {$n$#$n}$n") % [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) proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode = diff --git a/compiler/nim.nim b/compiler/nim.nim index bab1949b5..5f3347255 100644 --- a/compiler/nim.nim +++ b/compiler/nim.nim @@ -36,7 +36,7 @@ proc prependCurDir(f: AbsoluteFile): AbsoluteFile = if os.isAbsolute(f.string): result = f else: result = AbsoluteFile("./" & f.string) else: - result = AbsoluteFile f + result = f proc processCmdLine(pass: TCmdLinePass, cmd: string; config: ConfigRef) = var p = parseopt.initOptParser(cmd) diff --git a/compiler/options.nim b/compiler/options.nim index 4927579e3..02f284676 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -514,7 +514,7 @@ proc getOsCacheDir(): string = when defined(posix): result = getEnv("XDG_CACHE_HOME", getHomeDir() / ".cache") / "nim" else: - result = getHomeDir() / genSubDir + result = getHomeDir() / genSubDir.string proc getNimcacheDir*(conf: ConfigRef): AbsoluteDir = # XXX projectName should always be without a file extension! -- cgit 1.4.1-2-gfad0