From bdb5eca353acd46654f89edeef6f84d0dba8f5d0 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Mon, 25 Jul 2022 21:06:27 +0200
Subject: [PATCH] move -d:nimRawSetjmp to nim.cfg (#14)

Refs https://github.com/status-im/nimbus-build-system/issues/44
---
 .github/workflows/ci.yml | 4 ----
 nim.cfg                  | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c133f0..5991ee8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -155,10 +155,6 @@ jobs:
 
       - name: Run tests
         run: |
-          if [[ "${{ matrix.target.os }}" == "windows" ]]; then
-            # https://github.com/status-im/nimbus-eth2/issues/3121
-            export NIMFLAGS="-d:nimRawSetjmp"
-          fi
           nim --version
           env TEST_LANG="c" nim --hints:off --verbosity:0 test
           env TEST_LANG="cpp" nim --hints:off --verbosity:0 test
diff --git a/nim.cfg b/nim.cfg
index 23b72e2..c2c79f5 100644
--- a/nim.cfg
+++ b/nim.cfg
@@ -6,3 +6,8 @@
 
 --threads:on
 
+# Avoid some rare stack corruption while using exceptions with a SEH-enabled
+# toolchain: https://github.com/status-im/nimbus-eth2/issues/3121
+@if windows and not vcc:
+  --define:nimRawSetjmp
+@end