From d1b7aa28e7b5b847a44eda11ff7aadbe3bb0b49a Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 11 Jan 2019 15:55:16 +0100
Subject: [PATCH] fixes #10240 (#10269)

* kochdocs.nim: code cleanup

* fixes #10420
---
 compiler/scriptconfig.nim | 6 ++++--
 tools/kochdocs.nim        | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/compiler/scriptconfig.nim b/compiler/scriptconfig.nim
index bfff864797a2..e3a9478d1314 100644
--- a/compiler/scriptconfig.nim
+++ b/compiler/scriptconfig.nim
@@ -63,8 +63,10 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
     os.removeFile getString(a, 0)
   cbos createDir:
     os.createDir getString(a, 0)
-  cbos getOsError:
-    setResult(a, errorMsg)
+
+  result.registerCallback "stdlib.system.getOsError",
+    proc (a: VmArgs) = setResult(a, errorMsg)
+
   cbos setCurrentDir:
     os.setCurrentDir getString(a, 0)
   cbos getCurrentDir:
diff --git a/tools/kochdocs.nim b/tools/kochdocs.nim
index 3d146188fa28..68662bab2422 100644
--- a/tools/kochdocs.nim
+++ b/tools/kochdocs.nim
@@ -56,12 +56,8 @@ proc nimexec*(cmd: string) =
   exec findNim() & " " & cmd
 
 proc nimCompile*(input: string, outputDir = "bin", mode = "c", options = "") =
-  # TODO: simplify pending https://github.com/nim-lang/Nim/issues/9513
-  var cmd = findNim() & " " & mode
   let output = outputDir / input.splitFile.name.exe
-  cmd.add " -o:" & output
-  cmd.add " " & options
-  cmd.add " " & input
+  let cmd = findNim() & " " & mode & " -o:" & output & " " & options & " " & input
   exec cmd
 
 const