From 25ae23a84bcdae745270299d049063f416cf0eb3 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Wed, 27 Jun 2018 10:02:37 +0900 Subject: [PATCH] Make PR extccomp changes --- compiler/extccomp.nim | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim index 51f4d38ae..1aa659fff 100644 --- a/compiler/extccomp.nim +++ b/compiler/extccomp.nim @@ -584,7 +584,7 @@ proc getCompileCFileCmd*(conf: ConfigRef; cfile: Cfile): string = # D files are required by nintendo switch libs for # compilation. They are basically a list of all includes. - let dfile = objfile.replace(".o", ".d").quoteShell() + let dfile = objfile.changeFileExt(".d").quoteShell() objfile = quoteShell(objfile) cf = quoteShell(cf) @@ -694,8 +694,7 @@ proc getLinkCmd(conf: ConfigRef; projectfile, objfiles: string): string = # Map files are required by Nintendo Switch compilation. They are a list # of all function calls in the library and where they come from. - var mapfile = getNimcacheDir(conf) / splitFile(projectFile).name & ".map" - mapfile = quoteShell(mapfile) + let mapfile = quoteShell(getNimcacheDir(conf) / splitFile(projectFile).name & ".map") let linkOptions = getLinkOptions(conf) & " " & getConfigVar(conf, conf.cCompiler, ".options.linker")