summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorVarriount <Varriount@users.noreply.github.com>2015-01-17 21:20:41 -0500
committerVarriount <Varriount@users.noreply.github.com>2015-01-17 21:20:41 -0500
commitd3a8d5b1736cc56fba83c185dfeb5db7b74ad6b4 (patch)
tree701d72017c7cfbd91c25e77dca7a339d2599ab7f
parent4b30c6d9ced63c2621111f46b7490c94348a2452 (diff)
parent66a9be4e026b0b9c9756a68513ff691b35d5759f (diff)
downloadNim-d3a8d5b1736cc56fba83c185dfeb5db7b74ad6b4.tar.gz
Merge pull request #1981 from Varriount/zielmicha-devel
Custom merge of Zielmicha devel
-rw-r--r--compiler/extccomp.nim3
-rw-r--r--tests/misc/tspace in filename.nim3
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index ad9c38904..bc888315f 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -332,7 +332,6 @@ const
     ucc(),
     icl()]
 
-const
   hExt* = ".h"
 
 var
@@ -547,6 +546,7 @@ proc getCompileCFileCmd*(cfilename: string, isExternal = false): string =
                 else:
                   completeCFilePath(toObjFile(cfile))
   objfile = quoteShell(objfile)
+  cfile = quoteShell(cfile)
   result = quoteShell(compilePattern % [
     "file", cfile, "objfile", objfile, "options", options,
     "include", includeCmd, "nimrod", getPrefixDir(),
@@ -717,4 +717,3 @@ proc writeMapping*(gSymbolMapping: PRope) =
   
   appf(code, "\n[Symbols]$n$1", [gSymbolMapping])
   writeRope(code, joinPath(gProjectPath, "mapping.txt"))
-  
diff --git a/tests/misc/tspace in filename.nim b/tests/misc/tspace in filename.nim
new file mode 100644
index 000000000..8db4b52f2
--- /dev/null
+++ b/tests/misc/tspace in filename.nim
@@ -0,0 +1,3 @@
+# Test for the compiler to be able to compile a Nim file with spaces in it.
+
+echo("Successful")
\ No newline at end of file