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

Don't remove extension of source files twice, if filenames contain dots

Browse source
This commit is contained in:
Jörg Wollenschläger 2018-06-26 20:08:40 +09:00
commit 7e89f9a09a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/extccomp.nim
View file

@ -603,7 +603,7 @@ proc addExternalFileToCompile*(conf: ConfigRef; c: var Cfile) =
proc addExternalFileToCompile*(conf: ConfigRef; filename: string) = proc addExternalFileToCompile*(conf: ConfigRef; filename: string) =
var c = Cfile(cname: filename, var c = Cfile(cname: filename,
obj: toObjFile(conf, completeCFilePath(conf, changeFileExt(filename, ""), false)), obj: toObjFile(conf, completeCFilePath(conf, filename, false)),
flags: {CfileFlag.External}) flags: {CfileFlag.External})
addExternalFileToCompile(conf, c) addExternalFileToCompile(conf, c)

2
compiler/pragmas.nim
View file

@ -466,7 +466,7 @@ proc processCompile(c: PContext, n: PNode) =
else: else:
found = findFile(c.config, s) found = findFile(c.config, s)
if found.len == 0: found = s if found.len == 0: found = s
let obj = toObjFile(c.config, completeCFilePath(c.config, changeFileExt(found, ""), false)) let obj = toObjFile(c.config, completeCFilePath(c.config, found, false))
docompile(c, it, found, obj) docompile(c, it, found, obj)
proc processCommonLink(c: PContext, n: PNode, feature: TLinkFeature) = proc processCommonLink(c: PContext, n: PNode, feature: TLinkFeature) =