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

Merge pull request #1981 from Varriount/zielmicha-devel

Browse source 
Custom merge of Zielmicha devel
This commit is contained in:
Varriount 2015-01-17 21:20:41 -05:00
commit d3a8d5b173
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/extccomp.nim
View file

@ -332,7 +332,6 @@ const
ucc(), ucc(),
icl()] icl()]
const
hExt* = ".h" hExt* = ".h"
var var
@ -547,6 +546,7 @@ proc getCompileCFileCmd*(cfilename: string, isExternal = false): string =
else: else:
completeCFilePath(toObjFile(cfile)) completeCFilePath(toObjFile(cfile))
objfile = quoteShell(objfile) objfile = quoteShell(objfile)
cfile = quoteShell(cfile)
result = quoteShell(compilePattern % [ result = quoteShell(compilePattern % [
"file", cfile, "objfile", objfile, "options", options, "file", cfile, "objfile", objfile, "options", options,
"include", includeCmd, "nimrod", getPrefixDir(), "include", includeCmd, "nimrod", getPrefixDir(),
@ -717,4 +717,3 @@ proc writeMapping*(gSymbolMapping: PRope) =
appf(code, "\n[Symbols]$n$1", [gSymbolMapping]) appf(code, "\n[Symbols]$n$1", [gSymbolMapping])
writeRope(code, joinPath(gProjectPath, "mapping.txt")) writeRope(code, joinPath(gProjectPath, "mapping.txt"))

3
tests/misc/tspace in filename.nim Normal file
View file

@ -0,0 +1,3 @@
# Test for the compiler to be able to compile a Nim file with spaces in it.
echo("Successful")