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

Fixes #9154 (#9193)

Browse source
This commit is contained in:
manterolat 2018-10-10 08:17:28 -03:00 • committed by Andreas Rumpf
commit 16a941a642
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/cgen.nim
View file

@ -1635,6 +1635,9 @@ proc cgenWriteModules*(backend: RootRef, config: ConfigRef) =
# deps are allowed (and the system module is processed in the wrong # deps are allowed (and the system module is processed in the wrong
# order anyway) # order anyway)
g.config = config g.config = config
let (outDir, _, _) = splitFile(config.outfile)
if not outDir.isEmpty:
createDir(outDir)
if g.generatedHeader != nil: finishModule(g.generatedHeader) if g.generatedHeader != nil: finishModule(g.generatedHeader)
while g.forwardedProcsCounter > 0: while g.forwardedProcsCounter > 0:
for m in cgenModules(g): for m in cgenModules(g):

3
compiler/jsgen.nim
View file

@ -2345,6 +2345,9 @@ proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode =
else: AbsoluteFile(getCurrentDir() / m.config.outFile.string) else: AbsoluteFile(getCurrentDir() / m.config.outFile.string)
else: else:
changeFileExt(completeCFilePath(m.config, AbsoluteFile f), ext) changeFileExt(completeCFilePath(m.config, AbsoluteFile f), ext)
let (outDir, _, _) = splitFile(outfile)
if not outDir.isEmpty:
createDir(outDir)
discard writeRopeIfNotEqual(genHeader() & code, outfile) discard writeRopeIfNotEqual(genHeader() & code, outfile)
for obj, content in items(globals.classes): for obj, content in items(globals.classes):
genClass(m.config, obj, content, ext) genClass(m.config, obj, content, ext)