From ec68d89e42e1dbd0855956bef7a427aea6e109d7 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 8 Feb 2019 17:41:34 +0100
Subject: [PATCH] make it work with latest system.nim

---
 lib/system.nim | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/system.nim b/lib/system.nim
index 4c7fa83ca5..6087b641c5 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -3001,6 +3001,9 @@ template newException*(exceptn: typedesc, message: string;
 when hostOS == "standalone":
   include "$projectpath/panicoverride"
 
+when not defined(js) and not defined(nimscript):
+  include "system/ansi_c"
+
 when not declared(sysFatal):
   {.push profiler: off.}
   when hostOS == "standalone":
@@ -3010,17 +3013,8 @@ when not declared(sysFatal):
     proc sysFatal(exceptn: typedesc, message, arg: string) {.inline.} =
       rawoutput(message)
       panic(arg)
-  elif defined(nimQuirky):
+  elif defined(nimQuirky) and not defined(nimscript):
     proc name(t: typedesc): string {.magic: "TypeTrait".}
-    proc sysFatal(exceptn: typedesc, message: string) {.inline, noReturn.} =
-      var buf = newStringOfCap(200)
-      add(buf, "Error: unhandled exception: ")
-      add(buf, message)
-      add(buf, " [")
-      add(buf, name exceptn)
-      add(buf, "]")
-      echo buf
-      quit 1
 
     proc sysFatal(exceptn: typedesc, message, arg: string) {.inline, noReturn.} =
       var buf = newStringOfCap(200)
@@ -3030,8 +3024,11 @@ when not declared(sysFatal):
       add(buf, " [")
       add(buf, name exceptn)
       add(buf, "]")
-      echo buf
+      cstderr.rawWrite buf
       quit 1
+
+    proc sysFatal(exceptn: typedesc, message: string) {.inline, noReturn.} =
+      sysFatal(exceptn, message, "")
   else:
     proc sysFatal(exceptn: typedesc, message: string) {.inline, noReturn.} =
       var e: ref exceptn
@@ -3178,7 +3175,6 @@ when not defined(JS): #and not defined(nimscript):
       {.pop.}
 
   when not defined(nimscript):
-    include "system/ansi_c"
     include "system/memory"
 
     proc zeroMem(p: pointer, size: Natural) =