From 1e9ad9e3d92fb33b4f3cc5baa079aed46cc202ad Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Thu, 17 Aug 2017 11:52:26 -0500
Subject: [PATCH] Nim toolchain improvements

- Fix fatal exception handling so that stack traces are dumped
- Add 'include/nim' directories to Nim module search path
- Enable release optimizations for release builds

Fix #2493
---
 repos/base/mk/generic.mk      | 2 ++
 repos/base/mk/spec/release.mk | 1 +
 2 files changed, 3 insertions(+)

diff --git a/repos/base/mk/generic.mk b/repos/base/mk/generic.mk
index 88e3493a9..663bedc3c 100644
--- a/repos/base/mk/generic.mk
+++ b/repos/base/mk/generic.mk
@@ -97,6 +97,8 @@ else
 NIM_MAKEFILES := $(foreach X,$(SRC_NIM),$(X).mk)
 NIM_ARGS  = --compileOnly --os:genode --cpu:$(NIM_CPU)
 NIM_ARGS += --verbosity:0 --hint[Processing]:off --nimcache:.
+NIM_ARGS += --noCppExceptions
+NIM_ARGS += $(foreach X,$(call select_from_repositories,include/nim),--path:$(X))
 NIM_ARGS += $(NIM_OPT)
 
 # Generate the C++ sources and compilation info
diff --git a/repos/base/mk/spec/release.mk b/repos/base/mk/spec/release.mk
index 63b1a66bb..070225128 100644
--- a/repos/base/mk/spec/release.mk
+++ b/repos/base/mk/spec/release.mk
@@ -1 +1,2 @@
 CC_OPT += -DGENODE_RELEASE
+NIM_ARGS += -d:release