mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-06 13:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8123 from jwollen/cfile_extensions

Browse Source 
Don't remove extension of source files twice, if filenames contain dots
This commit is contained in:
Andreas Rumpf
2018-06-26 18:31:35 +02:00
committed by GitHub
parent 5976bd96be 7e89f9a09a
commit d08b9eb673
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) =
var c = Cfile(cname: filename,
obj: toObjFile(conf, completeCFilePath(conf, changeFileExt(filename, ""), false)),
obj: toObjFile(conf, completeCFilePath(conf, filename, false)),
flags: {CfileFlag.External})
addExternalFileToCompile(conf, c)

2
compiler/pragmas.nim
View File

@@ -466,7 +466,7 @@ proc processCompile(c: PContext, n: PNode) =
else:
found = findFile(c.config, 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)
proc processCommonLink(c: PContext, n: PNode, feature: TLinkFeature) =