Merge pull request nim-lang#1981 from Varriount/zielmicha-devel

Custom merge of Zielmicha devel
InMath · Jan 18, 2015 · d3a8d5b · d3a8d5b
2 parents 4b30c6d + 66a9be4
commit d3a8d5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -0,0 +1,3 @@
+# Test for the compiler to be able to compile a Nim file with spaces in it.
+
+echo("Successful")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Test for the compiler to be able to compile a Nim file with spaces in it.

		echo("Successful")