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

Give different names to objects coming from cpp files (#8278)

Browse source 
Prevent some nasty linker errors if the user switches between c and cpp
backends.
This commit is contained in:
LemonBoy 2018-07-13 15:23:41 +02:00 • committed by Andreas Rumpf
commit 54a85b4ff5
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/extccomp.nim
View file

@ -434,10 +434,7 @@ proc completeCFilePath*(conf: ConfigRef; cfile: string, createSubDir: bool = tru
proc toObjFile*(conf: ConfigRef; filename: string): string = proc toObjFile*(conf: ConfigRef; filename: string): string =
# Object file for compilation # Object file for compilation
#if filename.endsWith(".cpp"): result = filename & "." & CC[conf.cCompiler].objExt
# result = changeFileExt(filename, "cpp." & CC[cCompiler].objExt)
#else:
result = changeFileExt(filename, CC[conf.cCompiler].objExt)
proc addFileToCompile*(conf: ConfigRef; cf: Cfile) = proc addFileToCompile*(conf: ConfigRef; cf: Cfile) =
conf.toCompile.add(cf) conf.toCompile.add(cf)