diff options
Diffstat (limited to 'boot.nim')
-rw-r--r-- | boot.nim | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/boot.nim b/boot.nim index 7b1745391..b7e2b221f 100644 --- a/boot.nim +++ b/boot.nim @@ -11,7 +11,10 @@ import os, strutils const - BootCmd = "nimrod cc --compile:build/platdef.c $1 rod/nimrod.nim" + BootCmd = [ + "nimrod cc --compile:build/platdef.c $1 rod/nimrod.nim", + "bin/nimrod cc --compile:build/platdef.c $1 rod/nimrod.nim" + ] PlatdefCTmpl = """ /* Generated by boot.nim */ char* nimOS(void) { return "$1"; } @@ -32,7 +35,7 @@ proc writePlatdefC = proc rodsrc = const - blacklist = ["nsystem", "nmath", "nos", "ntime", "strutils"] + blacklist = ["nsystem", "nmath", "nos", "osproc", "ntime", "strutils"] cmd = "nimrod boot --skip_proj_cfg -o:rod/$1.nim nim/$1" for fi in walkFiles("nim/*.pas"): var f = extractFileTrunk(fi) @@ -46,10 +49,10 @@ proc boot(args: string) = rodsrc() var newExe = appendFileExt("rod/nimrod", ExeExt) var oldExe = appendFileExt("bin/nimrod", ExeExt) - for i in 1..2: - Echo("iteration: ", $i) + for i in 0..1: + Echo("iteration: ", $(i+1)) # use the new executable to compile the files in the bootstrap directory: - Exec(Bootcmd % args) + Exec(Bootcmd[i] % args) if sameFileContent(newExe, oldExe): Echo("executables are equal: SUCCESS!") return |